From 3779a5b53f499a7ca57c1b4bd9ea0eb37be9adc1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 22 Jun 2013 20:44:22 +0200 Subject: [PATCH 1/7] linux: update kernel config Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 7 ++----- projects/ATV/linux/linux.i386.conf | 9 +++------ projects/Fusion/linux/linux.i386.conf | 8 +++----- projects/Fusion/linux/linux.x86_64.conf | 8 +++----- projects/Generic/linux/linux.i386.conf | 8 +++----- projects/Generic/linux/linux.x86_64.conf | 8 +++----- projects/Generic_OSS/linux/linux.i386.conf | 8 +++----- projects/ION/linux/linux.i386.conf | 8 +++----- projects/ION/linux/linux.x86_64.conf | 8 +++----- projects/Intel/linux/linux.i386.conf | 8 +++----- projects/Intel/linux/linux.x86_64.conf | 8 +++----- projects/RPi/linux/linux.arm.conf | 4 ++-- projects/Ultra/linux/linux.x86_64.conf | 9 +++------ projects/Virtual/linux/linux.i386.conf | 8 +++----- projects/Virtual/linux/linux.x86_64.conf | 8 +++----- 15 files changed, 43 insertions(+), 74 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 1f9e881748..e422229219 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -81,7 +81,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -2123,6 +2122,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +# CONFIG_DVB_CXD2099 is not set CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2151,8 +2151,6 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m -CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -2925,7 +2923,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -# CONFIG_DVB_CXD2099 is not set # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 018fa52088..2c3b6d765b 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -76,7 +76,6 @@ CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1304,7 +1303,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2027,6 +2026,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +# CONFIG_DVB_CXD2099 is not set CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2055,8 +2055,6 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m -CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -2797,7 +2795,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -# CONFIG_DVB_CXD2099 is not set # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index a3d67b3469..8f4346b4df 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1339,7 +1338,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2315,6 +2314,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2352,7 +2352,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3114,7 +3113,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 249f5a70be..daa985ecbe 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -81,7 +81,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1301,7 +1300,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2271,6 +2270,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2308,7 +2308,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3061,7 +3060,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 1b9f111737..215e2c5780 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1395,7 +1394,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2398,6 +2397,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2435,7 +2435,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3292,7 +3291,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 22f680251f..f3712b09f7 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -83,7 +83,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1360,7 +1359,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2357,6 +2356,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2394,7 +2394,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3243,7 +3242,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 54219b421e..d5522ccee0 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1393,7 +1392,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2396,6 +2395,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2433,7 +2433,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3295,7 +3294,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 555f7664db..2a2dac6b29 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1346,7 +1345,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2324,6 +2323,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2361,7 +2361,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3168,7 +3167,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 210c2e07a9..7211f2bfad 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -81,7 +81,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1290,7 +1289,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2262,6 +2261,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2299,7 +2299,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3095,7 +3094,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 6a44a3b621..6b2f847708 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1356,7 +1355,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2342,6 +2341,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2379,7 +2379,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3220,7 +3219,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 44f66f5c58..d67a9bdc53 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -81,7 +81,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1301,7 +1300,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2281,6 +2280,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2318,7 +2318,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3148,7 +3147,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 3e8b90bbb8..1668864052 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.9.6 Kernel Configuration +# Linux/arm 3.9.7 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -929,7 +929,7 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 074e68f047..1ef6cb6fae 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -81,7 +81,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1267,7 +1266,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2105,6 +2104,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +# CONFIG_DVB_CXD2099 is not set CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2133,8 +2133,6 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m -CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -2865,7 +2863,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -# CONFIG_DVB_CXD2099 is not set # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 537360ebd2..f661a2a11f 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.9.3 Kernel Configuration +# Linux/i386 3.9.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -80,7 +80,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1395,7 +1394,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2398,6 +2397,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2435,7 +2435,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3295,7 +3294,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 85092db1a0..f8b42b6ad2 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.9.3 Kernel Configuration +# Linux/x86_64 3.9.7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -83,7 +83,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1360,7 +1359,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2357,6 +2356,7 @@ CONFIG_MEDIA_TUNER_TUA9001=m # CONFIG_DVB_CX24120=m CONFIG_DVB_STB0899=m +CONFIG_DVB_CXD2099=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -2394,7 +2394,6 @@ CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_M88DS3103=m CONFIG_DVB_M88DC2800=m -CONFIG_DVB_SIT2=m CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m @@ -3246,7 +3245,6 @@ CONFIG_ZSMALLOC=y # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set CONFIG_STAGING_MEDIA=y CONFIG_DVB_AS102=m -CONFIG_DVB_CXD2099=m # CONFIG_VIDEO_DT3155 is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_SOLO6X10 is not set From 072663ce2bcd24d836b12985fd97219a5b7fc78b Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 23 Jun 2013 14:16:59 +0200 Subject: [PATCH 2/7] fglrx-legacy: Only have IDs in there that are not existent in normal fglrx --- ...gacy-12.6-remove-overlapping-pci-ids.patch | 442 +++++++++++++++++- 1 file changed, 428 insertions(+), 14 deletions(-) diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch b/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch index 4545680d82..e805e46f07 100644 --- a/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch +++ b/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch @@ -1,19 +1,433 @@ diff -Naur xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h --- xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h 2012-07-18 17:58:01.000000000 +0200 +++ xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h 2013-06-06 23:56:41.440839811 +0200 -@@ -89,7 +89,6 @@ - FGL_ASIC_ID(0x677B), - FGL_ASIC_ID(0x6772), - FGL_ASIC_ID(0x6779), +@@ -12,325 +12,138 @@ + * year of creation of the work. + */ + +- FGL_ASIC_ID(0x9640), +- FGL_ASIC_ID(0x9641), +- FGL_ASIC_ID(0x9642), +- FGL_ASIC_ID(0x9643), +- FGL_ASIC_ID(0x9644), +- FGL_ASIC_ID(0x9645), +- FGL_ASIC_ID(0x9647), +- FGL_ASIC_ID(0x9648), +- FGL_ASIC_ID(0x9649), +- FGL_ASIC_ID(0x964A), +- FGL_ASIC_ID(0x964B), +- FGL_ASIC_ID(0x964C), +- FGL_ASIC_ID(0x964E), +- FGL_ASIC_ID(0x964F), +- FGL_ASIC_ID(0x9903), +- FGL_ASIC_ID(0x9904), +- FGL_ASIC_ID(0x990F), +- FGL_ASIC_ID(0x9905), +- FGL_ASIC_ID(0x9906), +- FGL_ASIC_ID(0x9907), +- FGL_ASIC_ID(0x9908), +- FGL_ASIC_ID(0x9909), +- FGL_ASIC_ID(0x9992), +- FGL_ASIC_ID(0x9993), +- FGL_ASIC_ID(0x9994), +- FGL_ASIC_ID(0x990A), +- FGL_ASIC_ID(0x9900), +- FGL_ASIC_ID(0x9901), +- FGL_ASIC_ID(0x9990), +- FGL_ASIC_ID(0x9991), +- FGL_ASIC_ID(0x9803), +- FGL_ASIC_ID(0x9804), +- FGL_ASIC_ID(0x9805), +- FGL_ASIC_ID(0x9802), +- FGL_ASIC_ID(0x9808), +- FGL_ASIC_ID(0x9809), +- FGL_ASIC_ID(0x9806), +- FGL_ASIC_ID(0x9807), +- FGL_ASIC_ID(0x9610), +- FGL_ASIC_ID(0x9611), +- FGL_ASIC_ID(0x9612), +- FGL_ASIC_ID(0x9613), +- FGL_ASIC_ID(0x9614), +- FGL_ASIC_ID(0x9615), +- FGL_ASIC_ID(0x9616), +- FGL_ASIC_ID(0x9710), +- FGL_ASIC_ID(0x9711), +- FGL_ASIC_ID(0x9712), +- FGL_ASIC_ID(0x9713), +- FGL_ASIC_ID(0x9714), +- FGL_ASIC_ID(0x9715), +- FGL_ASIC_ID(0x68F8), +- FGL_ASIC_ID(0x68F9), +- FGL_ASIC_ID(0x68FE), +- FGL_ASIC_ID(0x68FA), +- FGL_ASIC_ID(0x689B), +- FGL_ASIC_ID(0x689E), +- FGL_ASIC_ID(0x6898), +- FGL_ASIC_ID(0x6899), +- FGL_ASIC_ID(0x689C), +- FGL_ASIC_ID(0x689D), +- FGL_ASIC_ID(0x68B8), +- FGL_ASIC_ID(0x68B9), +- FGL_ASIC_ID(0x68BE), +- FGL_ASIC_ID(0x68BA), +- FGL_ASIC_ID(0x68BF), +- FGL_ASIC_ID(0x68DA), +- FGL_ASIC_ID(0x68D8), +- FGL_ASIC_ID(0x68D9), +- FGL_ASIC_ID(0x68DE), +- FGL_ASIC_ID(0x6738), +- FGL_ASIC_ID(0x6739), +- FGL_ASIC_ID(0x673E), +- FGL_ASIC_ID(0x6778), +- FGL_ASIC_ID(0x677B), +- FGL_ASIC_ID(0x6772), +- FGL_ASIC_ID(0x6779), - FGL_ASIC_ID(0x6770), - FGL_ASIC_ID(0x671F), - FGL_ASIC_ID(0x6718), - FGL_ASIC_ID(0x6719), -@@ -193,7 +192,6 @@ - FGL_ASIC_ID(0x68D1), - FGL_ASIC_ID(0x68C7), - FGL_ASIC_ID(0x68E0), +- FGL_ASIC_ID(0x671F), +- FGL_ASIC_ID(0x6718), +- FGL_ASIC_ID(0x6719), +- FGL_ASIC_ID(0x671C), +- FGL_ASIC_ID(0x671D), +- FGL_ASIC_ID(0x675F), +- FGL_ASIC_ID(0x6751), +- FGL_ASIC_ID(0x675B), +- FGL_ASIC_ID(0x675D), +- FGL_ASIC_ID(0x6758), +- FGL_ASIC_ID(0x6759), +- FGL_ASIC_ID(0x6750), ++ /* Those are all PC IDs that are not existing in the non legacy fglrx */ + FGL_ASIC_ID(0x9400), + FGL_ASIC_ID(0x9401), + FGL_ASIC_ID(0x9402), + FGL_ASIC_ID(0x9403), + FGL_ASIC_ID(0x9405), +- FGL_ASIC_ID(0x950F), +- FGL_ASIC_ID(0x9513), +- FGL_ASIC_ID(0x9451), ++ FGL_ASIC_ID(0x940A), ++ FGL_ASIC_ID(0x940B), ++ FGL_ASIC_ID(0x940F), ++ FGL_ASIC_ID(0x9440), + FGL_ASIC_ID(0x9441), ++ FGL_ASIC_ID(0x9442), + FGL_ASIC_ID(0x9443), ++ FGL_ASIC_ID(0x9444), ++ FGL_ASIC_ID(0x9446), ++ FGL_ASIC_ID(0x9447), ++ FGL_ASIC_ID(0x944A), ++ FGL_ASIC_ID(0x944B), ++ FGL_ASIC_ID(0x944C), ++ FGL_ASIC_ID(0x944E), ++ FGL_ASIC_ID(0x944F), ++ FGL_ASIC_ID(0x9450), ++ FGL_ASIC_ID(0x9451), ++ FGL_ASIC_ID(0x9452), ++ FGL_ASIC_ID(0x9456), ++ FGL_ASIC_ID(0x945A), ++ FGL_ASIC_ID(0x945B), ++ FGL_ASIC_ID(0x945E), ++ FGL_ASIC_ID(0x9460), ++ FGL_ASIC_ID(0x9462), ++ FGL_ASIC_ID(0x946A), ++ FGL_ASIC_ID(0x946B), ++ FGL_ASIC_ID(0x947A), ++ FGL_ASIC_ID(0x947B), ++ FGL_ASIC_ID(0x9480), ++ FGL_ASIC_ID(0x9487), ++ FGL_ASIC_ID(0x9488), ++ FGL_ASIC_ID(0x9489), ++ FGL_ASIC_ID(0x948A), ++ FGL_ASIC_ID(0x948F), ++ FGL_ASIC_ID(0x9490), ++ FGL_ASIC_ID(0x9491), ++ FGL_ASIC_ID(0x9495), ++ FGL_ASIC_ID(0x9498), ++ FGL_ASIC_ID(0x949C), ++ FGL_ASIC_ID(0x949E), ++ FGL_ASIC_ID(0x949F), ++ FGL_ASIC_ID(0x94A0), ++ FGL_ASIC_ID(0x94A1), ++ FGL_ASIC_ID(0x94A3), ++ FGL_ASIC_ID(0x94B1), ++ FGL_ASIC_ID(0x94B3), ++ FGL_ASIC_ID(0x94B4), ++ FGL_ASIC_ID(0x94B5), + FGL_ASIC_ID(0x94C0), +- FGL_ASIC_ID(0x94C7), +- FGL_ASIC_ID(0x94C4), +- FGL_ASIC_ID(0x94C5), + FGL_ASIC_ID(0x94C1), + FGL_ASIC_ID(0x94C3), +- FGL_ASIC_ID(0x94CC), ++ FGL_ASIC_ID(0x94C4), ++ FGL_ASIC_ID(0x94C5), + FGL_ASIC_ID(0x94C6), +- FGL_ASIC_ID(0x95C0), +- FGL_ASIC_ID(0x95C5), +- FGL_ASIC_ID(0x95C7), +- FGL_ASIC_ID(0x95C9), +- FGL_ASIC_ID(0x95C6), +- FGL_ASIC_ID(0x958E), +- FGL_ASIC_ID(0x958A), +- FGL_ASIC_ID(0x9586), +- FGL_ASIC_ID(0x9587), +- FGL_ASIC_ID(0x9580), +- FGL_ASIC_ID(0x9588), +- FGL_ASIC_ID(0x9589), +- FGL_ASIC_ID(0x9590), +- FGL_ASIC_ID(0x9598), +- FGL_ASIC_ID(0x9599), +- FGL_ASIC_ID(0x9596), +- FGL_ASIC_ID(0x9597), ++ FGL_ASIC_ID(0x94C7), ++ FGL_ASIC_ID(0x94C8), ++ FGL_ASIC_ID(0x94C9), ++ FGL_ASIC_ID(0x94CB), ++ FGL_ASIC_ID(0x94CC), + FGL_ASIC_ID(0x9500), +- FGL_ASIC_ID(0x9515), +- FGL_ASIC_ID(0x9505), + FGL_ASIC_ID(0x9501), ++ FGL_ASIC_ID(0x9504), ++ FGL_ASIC_ID(0x9505), ++ FGL_ASIC_ID(0x9506), + FGL_ASIC_ID(0x9507), +- FGL_ASIC_ID(0x9519), ++ FGL_ASIC_ID(0x9508), ++ FGL_ASIC_ID(0x9509), ++ FGL_ASIC_ID(0x950F), ++ FGL_ASIC_ID(0x9511), ++ FGL_ASIC_ID(0x9513), ++ FGL_ASIC_ID(0x9515), + FGL_ASIC_ID(0x9517), ++ FGL_ASIC_ID(0x9519), + FGL_ASIC_ID(0x9540), + FGL_ASIC_ID(0x9541), + FGL_ASIC_ID(0x9542), + FGL_ASIC_ID(0x954E), + FGL_ASIC_ID(0x954F), +- FGL_ASIC_ID(0x9487), +- FGL_ASIC_ID(0x948F), +- FGL_ASIC_ID(0x9498), +- FGL_ASIC_ID(0x9490), +- FGL_ASIC_ID(0x9495), +- FGL_ASIC_ID(0x94B5), +- FGL_ASIC_ID(0x94B3), +- FGL_ASIC_ID(0x94B1), +- FGL_ASIC_ID(0x94B4), +- FGL_ASIC_ID(0x944C), +- FGL_ASIC_ID(0x9450), +- FGL_ASIC_ID(0x9452), +- FGL_ASIC_ID(0x9442), +- FGL_ASIC_ID(0x9440), +- FGL_ASIC_ID(0x944E), +- FGL_ASIC_ID(0x9460), +- FGL_ASIC_ID(0x9462), +- FGL_ASIC_ID(0x6838), +- FGL_ASIC_ID(0x6839), +- FGL_ASIC_ID(0x683B), +- FGL_ASIC_ID(0x683D), +- FGL_ASIC_ID(0x683F), +- FGL_ASIC_ID(0x6858), +- FGL_ASIC_ID(0x6859), +- FGL_ASIC_ID(0x6849), +- FGL_ASIC_ID(0x6850), +- FGL_ASIC_ID(0x6818), +- FGL_ASIC_ID(0x6819), +- FGL_ASIC_ID(0x6798), +- FGL_ASIC_ID(0x679A), +- FGL_ASIC_ID(0x6799), +- FGL_ASIC_ID(0x679E), +- FGL_ASIC_ID(0x68A0), +- FGL_ASIC_ID(0x68B0), +- FGL_ASIC_ID(0x68B1), +- FGL_ASIC_ID(0x68A1), +- FGL_ASIC_ID(0x68A8), +- FGL_ASIC_ID(0x6890), +- FGL_ASIC_ID(0x68C0), +- FGL_ASIC_ID(0x68C1), +- FGL_ASIC_ID(0x68D0), +- FGL_ASIC_ID(0x68D1), +- FGL_ASIC_ID(0x68C7), +- FGL_ASIC_ID(0x68E0), - FGL_ASIC_ID(0x68E1), - FGL_ASIC_ID(0x68F0), - FGL_ASIC_ID(0x68F1), - FGL_ASIC_ID(0x68E4), +- FGL_ASIC_ID(0x68F0), +- FGL_ASIC_ID(0x68F1), +- FGL_ASIC_ID(0x68E4), +- FGL_ASIC_ID(0x68E5), +- FGL_ASIC_ID(0x94CB), +- FGL_ASIC_ID(0x94C9), +- FGL_ASIC_ID(0x94C8), ++ FGL_ASIC_ID(0x9552), ++ FGL_ASIC_ID(0x9553), ++ FGL_ASIC_ID(0x9555), ++ FGL_ASIC_ID(0x9557), ++ FGL_ASIC_ID(0x955F), ++ FGL_ASIC_ID(0x9580), + FGL_ASIC_ID(0x9581), + FGL_ASIC_ID(0x9583), ++ FGL_ASIC_ID(0x9586), ++ FGL_ASIC_ID(0x9587), ++ FGL_ASIC_ID(0x9588), ++ FGL_ASIC_ID(0x9589), ++ FGL_ASIC_ID(0x958A), + FGL_ASIC_ID(0x958B), +- FGL_ASIC_ID(0x95C4), +- FGL_ASIC_ID(0x95C2), ++ FGL_ASIC_ID(0x958C), ++ FGL_ASIC_ID(0x958D), ++ FGL_ASIC_ID(0x958E), ++ FGL_ASIC_ID(0x958F), ++ FGL_ASIC_ID(0x9590), + FGL_ASIC_ID(0x9591), + FGL_ASIC_ID(0x9593), +- FGL_ASIC_ID(0x9506), +- FGL_ASIC_ID(0x9508), +- FGL_ASIC_ID(0x9504), +- FGL_ASIC_ID(0x9509), +- FGL_ASIC_ID(0x9553), +- FGL_ASIC_ID(0x9552), +- FGL_ASIC_ID(0x955F), +- FGL_ASIC_ID(0x9555), +- FGL_ASIC_ID(0x9491), +- FGL_ASIC_ID(0x9480), +- FGL_ASIC_ID(0x9488), +- FGL_ASIC_ID(0x948A), +- FGL_ASIC_ID(0x94A0), +- FGL_ASIC_ID(0x94A1), +- FGL_ASIC_ID(0x945A), +- FGL_ASIC_ID(0x945B), +- FGL_ASIC_ID(0x945E), +- FGL_ASIC_ID(0x944A), +- FGL_ASIC_ID(0x944B), +- FGL_ASIC_ID(0x6720), +- FGL_ASIC_ID(0x6721), +- FGL_ASIC_ID(0x6724), +- FGL_ASIC_ID(0x6725), +- FGL_ASIC_ID(0x6764), +- FGL_ASIC_ID(0x6765), +- FGL_ASIC_ID(0x6763), +- FGL_ASIC_ID(0x6761), +- FGL_ASIC_ID(0x6760), +- FGL_ASIC_ID(0x6744), +- FGL_ASIC_ID(0x6745), +- FGL_ASIC_ID(0x6742), +- FGL_ASIC_ID(0x6743), +- FGL_ASIC_ID(0x6741), +- FGL_ASIC_ID(0x6740), +- FGL_ASIC_ID(0x6820), +- FGL_ASIC_ID(0x6821), +- FGL_ASIC_ID(0x6824), +- FGL_ASIC_ID(0x6825), +- FGL_ASIC_ID(0x6830), +- FGL_ASIC_ID(0x6827), +- FGL_ASIC_ID(0x682D), +- FGL_ASIC_ID(0x682F), +- FGL_ASIC_ID(0x6831), +- FGL_ASIC_ID(0x6823), +- FGL_ASIC_ID(0x6826), +- FGL_ASIC_ID(0x6843), +- FGL_ASIC_ID(0x6840), +- FGL_ASIC_ID(0x6841), +- FGL_ASIC_ID(0x6842), +- FGL_ASIC_ID(0x6800), +- FGL_ASIC_ID(0x6801), +- FGL_ASIC_ID(0x68F1), +- FGL_ASIC_ID(0x68E8), +- FGL_ASIC_ID(0x68E9), +- FGL_ASIC_ID(0x6888), +- FGL_ASIC_ID(0x6889), +- FGL_ASIC_ID(0x688A), +- FGL_ASIC_ID(0x688D), +- FGL_ASIC_ID(0x688C), +- FGL_ASIC_ID(0x68A9), +- FGL_ASIC_ID(0x6880), +- FGL_ASIC_ID(0x68C8), +- FGL_ASIC_ID(0x68C9), +- FGL_ASIC_ID(0x958F), + FGL_ASIC_ID(0x9595), ++ FGL_ASIC_ID(0x9596), ++ FGL_ASIC_ID(0x9597), ++ FGL_ASIC_ID(0x9598), ++ FGL_ASIC_ID(0x9599), + FGL_ASIC_ID(0x959B), +- FGL_ASIC_ID(0x9557), +- FGL_ASIC_ID(0x9489), +- FGL_ASIC_ID(0x94A3), +- FGL_ASIC_ID(0x947A), +- FGL_ASIC_ID(0x947B), +- FGL_ASIC_ID(0x946A), +- FGL_ASIC_ID(0x946B), +- FGL_ASIC_ID(0x6728), +- FGL_ASIC_ID(0x6729), +- FGL_ASIC_ID(0x6722), +- FGL_ASIC_ID(0x6723), +- FGL_ASIC_ID(0x6726), +- FGL_ASIC_ID(0x6727), +- FGL_ASIC_ID(0x6766), +- FGL_ASIC_ID(0x6767), +- FGL_ASIC_ID(0x6768), +- FGL_ASIC_ID(0x6762), +- FGL_ASIC_ID(0x6700), +- FGL_ASIC_ID(0x6701), +- FGL_ASIC_ID(0x6702), +- FGL_ASIC_ID(0x6703), +- FGL_ASIC_ID(0x6704), +- FGL_ASIC_ID(0x6705), +- FGL_ASIC_ID(0x6706), +- FGL_ASIC_ID(0x6707), +- FGL_ASIC_ID(0x6708), +- FGL_ASIC_ID(0x6709), +- FGL_ASIC_ID(0x674A), +- FGL_ASIC_ID(0x6746), +- FGL_ASIC_ID(0x6747), +- FGL_ASIC_ID(0x6748), +- FGL_ASIC_ID(0x6749), +- FGL_ASIC_ID(0x940F), +- FGL_ASIC_ID(0x940B), +- FGL_ASIC_ID(0x940A), +- FGL_ASIC_ID(0x944F), +- FGL_ASIC_ID(0x9447), ++ FGL_ASIC_ID(0x95C0), ++ FGL_ASIC_ID(0x95C2), ++ FGL_ASIC_ID(0x95C4), ++ FGL_ASIC_ID(0x95C5), ++ FGL_ASIC_ID(0x95C6), ++ FGL_ASIC_ID(0x95C7), ++ FGL_ASIC_ID(0x95C9), + FGL_ASIC_ID(0x95CC), +- FGL_ASIC_ID(0x958C), +- FGL_ASIC_ID(0x958D), +- FGL_ASIC_ID(0x9511), +- FGL_ASIC_ID(0x949C), +- FGL_ASIC_ID(0x949F), +- FGL_ASIC_ID(0x949E), +- FGL_ASIC_ID(0x9444), +- FGL_ASIC_ID(0x9456), +- FGL_ASIC_ID(0x9446), +- FGL_ASIC_ID(0x6828), +- FGL_ASIC_ID(0x6808), +- FGL_ASIC_ID(0x684C), +- FGL_ASIC_ID(0x6809), +- FGL_ASIC_ID(0x6780), +- FGL_ASIC_ID(0x6784), +- FGL_ASIC_ID(0x6788), +- FGL_ASIC_ID(0x678A), +- FGL_ASIC_ID(0x68F2), + FGL_ASIC_ID(0x95CD), + FGL_ASIC_ID(0x95CE), + FGL_ASIC_ID(0x95CF), +- ++ FGL_ASIC_ID(0x9610), ++ FGL_ASIC_ID(0x9611), ++ FGL_ASIC_ID(0x9612), ++ FGL_ASIC_ID(0x9613), ++ FGL_ASIC_ID(0x9614), ++ FGL_ASIC_ID(0x9615), ++ FGL_ASIC_ID(0x9616), ++ FGL_ASIC_ID(0x9710), ++ FGL_ASIC_ID(0x9711), ++ FGL_ASIC_ID(0x9712), ++ FGL_ASIC_ID(0x9713), ++ FGL_ASIC_ID(0x9714), ++ FGL_ASIC_ID(0x9715), From 1fb78e57abbfc60399911334cfa66fae20d2838d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Jun 2013 21:18:18 +0300 Subject: [PATCH 3/7] service.openelec.settings: update to service.openelec.settings-0.1.23 --- packages/mediacenter/service.openelec.settings/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta index 90509dce99..375befcee7 100644 --- a/packages/mediacenter/service.openelec.settings/meta +++ b/packages/mediacenter/service.openelec.settings/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="service.openelec.settings" -PKG_VERSION="0.1.22" +PKG_VERSION="0.1.23" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="prop." From 4277c55a216d77cf733af98508a22d92df73d21c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Jun 2013 22:06:52 +0300 Subject: [PATCH 4/7] scripts/create_addon: also search for icon & changelog in PKG_BUILD dir --- scripts/create_addon | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index 1b2a28072f..0aed09d4c5 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -75,12 +75,18 @@ if [ -f $PKG_DIR/addon ]; then if [ -f $PKG_DIR/icon/icon.png ]; then cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID + elif [ -f $PKG_BUILD/icon/icon.png ]; then + cp $PKG_BUILD/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID + elif [ -f $PKG_BUILD/icon.png ]; then + cp $PKG_BUILD/icon.png $ADDON_BUILD/$PKG_ADDON_ID else echo "*** WARNING: It's recommended to have a $PKG_DIR/icon/icon.png file ***" fi if [ -f $PKG_DIR/changelog.txt ]; then cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID + elif [ -f $PKG_BUILD/changelog.txt ]; then + cp $PKG_BUILD/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID else echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***" fi @@ -96,6 +102,16 @@ if [ -f $PKG_DIR/addon ]; then mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID - cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt - cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + if [ -f $PKG_DIR/changelog.txt ]; then + cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt + elif [ -f $PKG_BUILD/changelog.txt ]; then + cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt + fi + if [ -f $PKG_DIR/icon/icon.png ]; then + cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + elif [ -f $PKG_BUILD/icon/icon.png ]; then + cp $PKG_BUILD/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + elif [ -f $PKG_BUILD/icon.png ]; then + cp $PKG_BUILD/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + fi fi From 1c5e34a84f0e1460dced0ee00d656656299cb4d1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Jun 2013 22:10:35 +0300 Subject: [PATCH 5/7] config/path: allow addons with empty PKG_SECTION --- config/path | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/path b/config/path index 20559a1019..4ace4b59e5 100644 --- a/config/path +++ b/config/path @@ -49,7 +49,7 @@ SED="sed -i" PKG_DEPENDS="" PKG_BUILD_DEPENDS="" PKG_PRIORITY="optional" - PKG_SECTION="misc" + PKG_SECTION="" PKG_SHORTDESC="$1 (autogenerated)" PKG_LONGDESC="" PKG_IS_ADDON="no" @@ -64,7 +64,9 @@ SED="sed -i" fi [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta - [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME" + if [ "$PKG_IS_ADDON" = "yes" ] ; then + [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME" + fi [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}` [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}` From 2d95d7c7e3623cab64d1558399336dd530ccfe20 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Jun 2013 22:55:57 +0300 Subject: [PATCH 6/7] scripts/create_addon: use addon's own version if provided --- scripts/create_addon | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index 0aed09d4c5..0f82bf8df1 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -55,9 +55,10 @@ if [ -f $PKG_DIR/addon ]; then mkdir -p $ADDON_BUILD/$PKG_ADDON_ID if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID + CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV" $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ -e "s|@PKG_NAME@|$PKG_NAME|g" \ - -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \ + -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \ -e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \ -e "s|@REQUIRES@|$REQUIRES|g" \ -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \ @@ -65,6 +66,8 @@ if [ -f $PKG_DIR/addon ]; then -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \ -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml + else + CUST_ADDON_VERSION="$PKG_VERSION" fi if [ -f $PKG_DIR/source/default.py ]; then @@ -97,15 +100,15 @@ if [ -f $PKG_DIR/addon ]; then cd $ADDON_BUILD echo "*** compressing Addon $PKG_ADDON_ID ... ***" - zip -rq $PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $PKG_ADDON_ID; + zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID; cd - mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID - cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID + cp $ADDON_BUILD/$PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID if [ -f $PKG_DIR/changelog.txt ]; then - cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt + cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt elif [ -f $PKG_BUILD/changelog.txt ]; then - cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt + cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt fi if [ -f $PKG_DIR/icon/icon.png ]; then cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png From fee0bab91116a48edf53bba058cdac4362d4e753 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Jun 2013 22:57:28 +0300 Subject: [PATCH 7/7] service.openelec.settings: allow building as addon --- .../service.openelec.settings/addon | 26 +++++++++++++++++++ .../service.openelec.settings/meta | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100755 packages/mediacenter/service.openelec.settings/addon diff --git a/packages/mediacenter/service.openelec.settings/addon b/packages/mediacenter/service.openelec.settings/addon new file mode 100755 index 0000000000..e1f77008a3 --- /dev/null +++ b/packages/mediacenter/service.openelec.settings/addon @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID + cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta index 375befcee7..057dca11a4 100644 --- a/packages/mediacenter/service.openelec.settings/meta +++ b/packages/mediacenter/service.openelec.settings/meta @@ -28,10 +28,10 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip" PKG_DEPENDS="connman hd-idle" PKG_BUILD_DEPENDS="toolchain python" PKG_PRIORITY="optional" -PKG_SECTION="mediacenter" +PKG_SECTION="" PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC" PKG_LONGDESC="service.openelec.settings: is a settings dialog for OpenELEC" -PKG_IS_ADDON="no" +PKG_IS_ADDON="yes" PKG_AUTORECONF="no"