From be07b595b17ef90198c916e0ed58cbbe5ea5cc41 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 19:27:51 +0200 Subject: [PATCH 01/25] bcm2835-driver: update to bcm2835-driver-b5898de Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 984317e282..111a023619 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="2997db1" +PKG_VERSION="b5898de" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 70ba4be08dd21698c62059fb0811c079284cdf46 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 19:28:14 +0200 Subject: [PATCH 02/25] bcm2835-bootloader: update to bcm2835-bootloader-b5898de Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index 3812d54d5f..ccc0c61128 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="2997db1" +PKG_VERSION="b5898de" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From 2a2f37bd4c12122fbbcb424c7fe454e6f3512347 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 19:28:52 +0200 Subject: [PATCH 03/25] linux: update RPi patches Signed-off-by: Stephan Raue --- ...inux-3.2.30-601-RPi_support-c14ddd0.patch} | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) rename packages/linux/patches/{linux-3.2.30-601-RPi_support-8524c78.patch => linux-3.2.30-601-RPi_support-c14ddd0.patch} (99%) diff --git a/packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch b/packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch similarity index 99% rename from packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch rename to packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch index f8d7654cc3..d878fb72d8 100644 --- a/packages/linux/patches/linux-3.2.30-601-RPi_support-8524c78.patch +++ b/packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch @@ -2674,10 +2674,10 @@ index 0000000..0aa916e +#endif diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c new file mode 100644 -index 0000000..72dcf31 +index 0000000..c9d6bd1 --- /dev/null +++ b/arch/arm/mach-bcm2708/bcm2708.c -@@ -0,0 +1,867 @@ +@@ -0,0 +1,897 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -3539,6 +3539,36 @@ index 0000000..72dcf31 +} +#endif + ++ ++/* The assembly versions in delay.S don't account for core freq changing in cpufreq driver */ ++/* Use 1MHz system timer for busy waiting */ ++void __udelay(unsigned long usecs) ++{ ++ unsigned long start = readl(__io_address(ST_BASE + 0x04)); ++ unsigned long now; ++ do { ++ now = readl(__io_address(ST_BASE + 0x04)); ++ } while ((long)(now - start) <= usecs); ++} ++ ++ ++void __const_udelay(unsigned long scaled_usecs) ++{ ++ /* want /107374, this is about 3% bigger. We know usecs is less than 2000, so shouldn't overflow */ ++ const unsigned long usecs = scaled_usecs * 10 >> 20; ++ unsigned long start = readl(__io_address(ST_BASE + 0x04)); ++ unsigned long now; ++ do { ++ now = readl(__io_address(ST_BASE + 0x04)); ++ } while ((long)(now - start) <= usecs); ++} ++ ++void __delay(int loops) ++{ ++ while (--loops > 0) ++ nop(); ++} ++ +MACHINE_START(BCM2708, "BCM2708") + /* Maintainer: Broadcom Europe Ltd. */ + .map_io = bcm2708_map_io,.init_irq = bcm2708_init_irq,.timer = From 207eb65a1e0b47f477a47cfcb59efe48b9598acf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Sep 2012 22:30:08 +0200 Subject: [PATCH 04/25] xbmc-frodo: update to xbmc-frodo-a653df7 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ....1.patch => xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch} | 0 ...-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch} | 0 ...f7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...atch => xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch} | 0 ...> xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...patch => xbmc-frodo-a653df7-454-disable_backslash-0.1.patch} | 0 ...ch => xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch} | 0 ...tch => xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch} | 0 ...b33-901-PR1426.patch => xbmc-frodo-a653df7-901-PR1426.patch} | 0 ...b33-901-PR1435.patch => xbmc-frodo-a653df7-901-PR1435.patch} | 0 ...b33-901-PR1467.patch => xbmc-frodo-a653df7-901-PR1467.patch} | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch => xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch => xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-454-disable_backslash-0.1.patch => xbmc-frodo-a653df7-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch => xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch => xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-901-PR1426.patch => xbmc-frodo-a653df7-901-PR1426.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-901-PR1435.patch => xbmc-frodo-a653df7-901-PR1435.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a642b33-901-PR1467.patch => xbmc-frodo-a653df7-901-PR1467.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 6facd0394d..9590937825 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="a642b33" +PKG_VERSION="a653df7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 65bdda4631..3b6e37f90c 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="a642b33" +PKG_VERSION="a653df7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1426.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1426.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1435.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1435.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1435.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1467.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1467.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-901-PR1467.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1467.patch From f47b899f156f9589b5d0426baed00aee02dd4b4b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Sep 2012 00:25:35 +0200 Subject: [PATCH 05/25] busybox: add nanodate support Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/busybox.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index dba8cd4c9f..5e19a7b3d4 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.1 -# Thu May 31 20:00:19 2012 +# Busybox version: 1.20.2 +# Wed Sep 26 00:23:57 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -176,7 +176,7 @@ CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_NANO=y CONFIG_FEATURE_DATE_COMPAT=y # CONFIG_HOSTID is not set CONFIG_ID=y From 402848e85d240412ec2e86a1825b735e5fa70dd7 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Wed, 26 Sep 2012 19:28:29 +0200 Subject: [PATCH 06/25] libxslt: update to libxslt-1.1.27 --- packages/3rdparty/lib/libxslt/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/lib/libxslt/meta b/packages/3rdparty/lib/libxslt/meta index 77dffee683..9f662864a4 100644 --- a/packages/3rdparty/lib/libxslt/meta +++ b/packages/3rdparty/lib/libxslt/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libxslt" -PKG_VERSION="1.1.26" +PKG_VERSION="1.1.27" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" From 400b47af9e28e9007545bec38473b8b95bc2e815 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 02:15:07 +0200 Subject: [PATCH 07/25] gcc: update to gcc-4.7.2 Signed-off-by: Stephan Raue --- packages/toolchain/lang/gcc/meta | 2 +- .../{gcc-4.7.1-cloog-0.17.patch => gcc-4.7.2-cloog-0.17.patch} | 0 ...ux64.patch => gcc-4.7.2-disable_multilib_i386_linux64.patch} | 0 ....7.1-dynamic_linker.patch => gcc-4.7.2-dynamic_linker.patch} | 0 ...dc++-v3_config.patch => gcc-4.7.2-libstdc++-v3_config.patch} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename packages/toolchain/lang/gcc/patches/{gcc-4.7.1-cloog-0.17.patch => gcc-4.7.2-cloog-0.17.patch} (100%) rename packages/toolchain/lang/gcc/patches/{gcc-4.7.1-disable_multilib_i386_linux64.patch => gcc-4.7.2-disable_multilib_i386_linux64.patch} (100%) rename packages/toolchain/lang/gcc/patches/{gcc-4.7.1-dynamic_linker.patch => gcc-4.7.2-dynamic_linker.patch} (100%) rename packages/toolchain/lang/gcc/patches/{gcc-4.7.1-libstdc++-v3_config.patch => gcc-4.7.2-libstdc++-v3_config.patch} (100%) diff --git a/packages/toolchain/lang/gcc/meta b/packages/toolchain/lang/gcc/meta index bd8a22ded6..6fb49aafaf 100644 --- a/packages/toolchain/lang/gcc/meta +++ b/packages/toolchain/lang/gcc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gcc" -PKG_VERSION="4.7.1" +PKG_VERSION="4.7.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.1-cloog-0.17.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.2-cloog-0.17.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/gcc-4.7.1-cloog-0.17.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.2-cloog-0.17.patch diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.1-disable_multilib_i386_linux64.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.2-disable_multilib_i386_linux64.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/gcc-4.7.1-disable_multilib_i386_linux64.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.2-disable_multilib_i386_linux64.patch diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.1-dynamic_linker.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.2-dynamic_linker.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/gcc-4.7.1-dynamic_linker.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.2-dynamic_linker.patch diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.7.1-libstdc++-v3_config.patch b/packages/toolchain/lang/gcc/patches/gcc-4.7.2-libstdc++-v3_config.patch similarity index 100% rename from packages/toolchain/lang/gcc/patches/gcc-4.7.1-libstdc++-v3_config.patch rename to packages/toolchain/lang/gcc/patches/gcc-4.7.2-libstdc++-v3_config.patch From a71720e33f00a36edbf3d6395409204f2e9e3786 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 02:15:56 +0200 Subject: [PATCH 08/25] wpa_supplicant: build with gnutls support Signed-off-by: Stephan Raue --- packages/network/wpa_supplicant/build | 4 ++-- packages/network/wpa_supplicant/meta | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build index c53863ad90..2c58f8b3da 100755 --- a/packages/network/wpa_supplicant/build +++ b/packages/network/wpa_supplicant/build @@ -29,7 +29,7 @@ cd $PKG_BUILD/$1 cp $ROOT/$PKG_DIR/config/makefile.config .config -# echo "CONFIG_TLS=gnutls" >> .config -# echo "CONFIG_GNUTLS_EXTRA=y" >> .config +echo "CONFIG_TLS=gnutls" >> .config +echo "CONFIG_GNUTLS_EXTRA=y" >> .config make V=1 LIBDIR=/usr/lib BINDIR=/usr/bin diff --git a/packages/network/wpa_supplicant/meta b/packages/network/wpa_supplicant/meta index 68960c5b37..ff26b07b33 100644 --- a/packages/network/wpa_supplicant/meta +++ b/packages/network/wpa_supplicant/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://hostap.epitest.fi/wpa_supplicant/" PKG_URL="http://hostap.epitest.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="dbus libnl openssl" -PKG_BUILD_DEPENDS="toolchain dbus libnl openssl" +PKG_DEPENDS="dbus libnl gnutls" +PKG_BUILD_DEPENDS="toolchain dbus libnl gnutls" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="wpa_supplicant: An IEEE 802.11i supplicant implementation" From da9324ddbe29e2bbffd905ddc2de699ce12b16c0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 02:47:02 +0200 Subject: [PATCH 09/25] projects/*/linux: add BTRFS filesystem support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 8 +++++--- projects/Fusion/linux/linux.i386.conf | 8 +++++--- projects/Fusion/linux/linux.x86_64.conf | 8 +++++--- projects/Generic/linux/linux.i386.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 | 6 +++--- projects/Ultra/linux/linux.x86_64.conf | 8 +++++--- projects/Virtual/linux/linux.i386.conf | 8 +++++--- projects/Virtual/linux/linux.x86_64.conf | 8 +++++--- 13 files changed, 63 insertions(+), 39 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index e05d0a5010..e9808d8979 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2557,7 +2557,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -2974,9 +2975,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 3a8753a8b8..e2afb36b13 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2905,7 +2905,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3324,9 +3325,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index a3455e8c57..911f9b619f 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.2.28 Kernel Configuration +# Linux/x86_64 3.2.30 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2845,7 +2845,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3267,9 +3268,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 02a3e7a611..e9f7d165b2 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3076,7 +3076,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3495,9 +3496,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 2942fffaef..204a6b45c4 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3078,7 +3078,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3497,9 +3498,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 1d5dd863e0..10eaf56a72 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2883,7 +2883,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3302,9 +3303,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 101ddee4eb..74e69e7e10 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.2.28 Kernel Configuration +# Linux/x86_64 3.2.30 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2811,7 +2811,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3232,9 +3233,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index e2f334fcab..c0d5d04622 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2944,7 +2944,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3363,9 +3364,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 6b13aa284e..182efed264 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.2.28 Kernel Configuration +# Linux/x86_64 3.2.30 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2873,7 +2873,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3294,9 +3295,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index c053a78b18..e2a298c909 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.2.29 Kernel Configuration +# Linux/arm 3.2.30 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1097,7 +1097,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set -CONFIG_SENSORS_BCM2835=y CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_BCM2835=y @@ -1884,7 +1883,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 703392753d..20d5691739 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.2.28 Kernel Configuration +# Linux/x86_64 3.2.30 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2636,7 +2636,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3057,9 +3058,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y # CONFIG_CRC8 is not set CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index cff883f343..47084822d6 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.2.28 Kernel Configuration +# Linux/i386 3.2.30 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2943,7 +2943,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3362,9 +3363,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index f8eb77737b..c750dfedaf 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.2.28 Kernel Configuration +# Linux/x86_64 3.2.30 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2871,7 +2871,8 @@ CONFIG_XFS_FS=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +# CONFIG_BTRFS_FS_POSIX_ACL is not set # CONFIG_NILFS2_FS is not set # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y @@ -3292,9 +3293,10 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y From 1c2c4c67a86a809cb39e9de329896d7f7be34265 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 04:05:16 +0200 Subject: [PATCH 10/25] linux: update RPi patches Signed-off-by: Stephan Raue --- ...inux-3.2.30-601-RPi_support-9245b4c.patch} | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) rename packages/linux/patches/{linux-3.2.30-601-RPi_support-c14ddd0.patch => linux-3.2.30-601-RPi_support-9245b4c.patch} (99%) diff --git a/packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch b/packages/linux/patches/linux-3.2.30-601-RPi_support-9245b4c.patch similarity index 99% rename from packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch rename to packages/linux/patches/linux-3.2.30-601-RPi_support-9245b4c.patch index d878fb72d8..7d810480e9 100644 --- a/packages/linux/patches/linux-3.2.30-601-RPi_support-c14ddd0.patch +++ b/packages/linux/patches/linux-3.2.30-601-RPi_support-9245b4c.patch @@ -2196,7 +2196,7 @@ index 0000000..5593167 +endmenu diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile new file mode 100644 -index 0000000..164ecb2 +index 0000000..3ee8a4b --- /dev/null +++ b/arch/arm/mach-bcm2708/Makefile @@ -0,0 +1,8 @@ @@ -2204,7 +2204,7 @@ index 0000000..164ecb2 +# Makefile for the linux kernel. +# + -+obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o ++obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o delay.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o + @@ -2674,10 +2674,10 @@ index 0000000..0aa916e +#endif diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c new file mode 100644 -index 0000000..c9d6bd1 +index 0000000..ac118a4 --- /dev/null +++ b/arch/arm/mach-bcm2708/bcm2708.c -@@ -0,0 +1,897 @@ +@@ -0,0 +1,891 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -3563,12 +3563,6 @@ index 0000000..c9d6bd1 + } while ((long)(now - start) <= usecs); +} + -+void __delay(int loops) -+{ -+ while (--loops > 0) -+ nop(); -+} -+ +MACHINE_START(BCM2708, "BCM2708") + /* Maintainer: Broadcom Europe Ltd. */ + .map_io = bcm2708_map_io,.init_irq = bcm2708_init_irq,.timer = @@ -4074,6 +4068,32 @@ index 0000000..5f9d725 +struct clk { + unsigned long rate; +}; +diff --git a/arch/arm/mach-bcm2708/delay.S b/arch/arm/mach-bcm2708/delay.S +new file mode 100644 +index 0000000..4256d29 +--- /dev/null ++++ b/arch/arm/mach-bcm2708/delay.S +@@ -0,0 +1,20 @@ ++/* ++ * linux/arch/arm/lib/delay.S ++ * ++ * Copyright (C) 1995, 1996 Russell King ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++#include ++ ++ .text ++@ Delay routine ++ENTRY(__delay) ++ subs r0, r0, #1 ++ bhi __delay ++ mov pc, lr ++ENDPROC(__delay) diff --git a/arch/arm/mach-bcm2708/dma.c b/arch/arm/mach-bcm2708/dma.c new file mode 100644 index 0000000..0b7a4f6 From dd96c7ba744ff50ea09d70b47637730e28538292 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 04:05:47 +0200 Subject: [PATCH 11/25] bcm2835-driver: update to bcm2835-driver-b87bc42 Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 111a023619..a3efb49641 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="b5898de" +PKG_VERSION="b87bc42" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From b87894e10443159829d583e6b14961111186e48a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 04:06:06 +0200 Subject: [PATCH 12/25] bcm2835-bootloader: update to bcm2835-bootloader-b87bc42 Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index ccc0c61128..79fe3aa029 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="b5898de" +PKG_VERSION="b87bc42" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From dbd55f87d7a20747081d14f4a54b7c91374139c5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 04:06:48 +0200 Subject: [PATCH 13/25] xbmc-pvr-addons: update to xbmc-pvr-addons-1963ed9 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-pvr-addons/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-pvr-addons/meta b/packages/mediacenter/xbmc-pvr-addons/meta index ce4d91bedf..7a81c49683 100644 --- a/packages/mediacenter/xbmc-pvr-addons/meta +++ b/packages/mediacenter/xbmc-pvr-addons/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-addons" -PKG_VERSION="fcdf846" +PKG_VERSION="1963ed9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 2c960890f95b38d7b8e15d8d837dc8dc96a4e096 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 06:04:37 +0200 Subject: [PATCH 14/25] xbmc-frodo: update to xbmc-frodo-63b6ee7 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ....1.patch => xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch} | 0 ...-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch} | 0 ...e7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...atch => xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch} | 0 ...> xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...patch => xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch} | 0 ...ch => xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch} | 0 ...tch => xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch} | 0 ...df7-901-PR1426.patch => xbmc-frodo-63b6ee7-901-PR1426.patch} | 0 ...df7-901-PR1435.patch => xbmc-frodo-63b6ee7-901-PR1435.patch} | 0 ...df7-901-PR1467.patch => xbmc-frodo-63b6ee7-901-PR1467.patch} | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch => xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch => xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-454-disable_backslash-0.1.patch => xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch => xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch => xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-901-PR1426.patch => xbmc-frodo-63b6ee7-901-PR1426.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-901-PR1435.patch => xbmc-frodo-63b6ee7-901-PR1435.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-a653df7-901-PR1467.patch => xbmc-frodo-63b6ee7-901-PR1467.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 9590937825..9bcadfa3c0 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="a653df7" +PKG_VERSION="63b6ee7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 3b6e37f90c..755a947a5c 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="a653df7" +PKG_VERSION="63b6ee7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1426.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1426.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1435.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1435.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1435.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1467.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a653df7-901-PR1467.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch From a012901ea646ff8876710b81b26a1841fbca79b9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Sep 2012 22:52:29 +0200 Subject: [PATCH 15/25] xbmc-frodo: update to xbmc-frodo-f5538a9 Signed-off-by: Stephan Raue --- .../xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- .../xbmc-frodo-63b6ee7-901-PR1467.patch | 477 ------------------ ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...o-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...rodo-f5538a9-311-fix_rsxs_build-0.1.patch} | 0 ...-texturepacker-hostflags-and-rework.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-f5538a9-452-change_lcd_content-0.1.patch} | 0 ...a9-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...o-f5538a9-454-disable_backslash-0.1.patch} | 0 ...5538a9-457-fix_connection_check-0.1.patch} | 0 ...f5538a9-463-add_remote_devinput-0.1.patch} | 0 ...ch => xbmc-frodo-f5538a9-901-PR1426.patch} | 0 ...ch => xbmc-frodo-f5538a9-901-PR1435.patch} | 0 15 files changed, 2 insertions(+), 479 deletions(-) delete mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch => xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch => xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch => xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch => xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch => xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-901-PR1426.patch => xbmc-frodo-f5538a9-901-PR1426.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-63b6ee7-901-PR1435.patch => xbmc-frodo-f5538a9-901-PR1435.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 9bcadfa3c0..73784cec66 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="63b6ee7" +PKG_VERSION="f5538a9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 755a947a5c..89f6878722 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="63b6ee7" +PKG_VERSION="f5538a9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch deleted file mode 100644 index 406ec3af31..0000000000 --- a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1467.patch +++ /dev/null @@ -1,477 +0,0 @@ -From 7d692ff576d0a713891908b5630ce2b8d0128f2e Mon Sep 17 00:00:00 2001 -From: davilla -Date: Sat, 22 Sep 2012 20:10:33 -0400 -Subject: [PATCH] add the ability to run a split gui/display resolution for - embedded platforms - ---- - xbmc/Application.cpp | 2 +- - xbmc/GUIInfoManager.cpp | 12 +++---- - xbmc/guilib/GraphicContext.cpp | 2 ++ - xbmc/guilib/Resolution.h | 5 +++ - xbmc/settings/GUISettings.cpp | 6 ++-- - xbmc/settings/GUIWindowSettingsCategory.cpp | 10 +++--- - .../GUIWindowSettingsScreenCalibration.cpp | 8 ++--- - xbmc/video/windows/GUIWindowFullScreen.cpp | 8 ++--- - xbmc/windowing/WinSystem.cpp | 14 ++++++--- - xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ - xbmc/windowing/X11/WinSystemX11GLES.cpp | 2 ++ - xbmc/windowing/egl/WinEGLPlatformGeneric.cpp | 11 +++---- - xbmc/windowing/egl/WinEGLPlatformRaspberryPI.cpp | 10 +++--- - xbmc/windowing/egl/WinSystemGLES.cpp | 33 +++++++++++++------- - xbmc/windowing/egl/WinSystemGLES.h | 2 ++ - xbmc/windowing/windows/WinSystemWin32.cpp | 2 ++ - 16 files changed, 80 insertions(+), 49 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 961e8f9..cd9fc9f 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -890,7 +890,7 @@ bool CApplication::CreateGUI() - return false; - - int iResolution = g_graphicsContext.GetVideoResolution(); -- CLog::Log(LOGINFO, "GUI format %ix%i %s", -+ CLog::Log(LOGINFO, "GUI format %ix%i, Display %s", - g_settings.m_ResInfo[iResolution].iWidth, - g_settings.m_ResInfo[iResolution].iHeight, - g_settings.m_ResInfo[iResolution].strMode.c_str()); -diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp -index fb6292d..c4ecd0a 100644 ---- a/xbmc/GUIInfoManager.cpp -+++ b/xbmc/GUIInfoManager.cpp -@@ -1493,14 +1493,14 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa - case SYSTEM_SCREEN_RESOLUTION: - if(g_Windowing.IsFullScreen()) - strLabel.Format("%ix%i@%.2fHz - %s (%02.2f fps)", -- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth, -- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight, -+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth, -+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight, - g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].fRefreshRate, - g_localizeStrings.Get(244), GetFPS()); - else - strLabel.Format("%ix%i - %s (%02.2f fps)", -- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth, -- g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight, -+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenWidth, -+ g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iScreenHeight, - g_localizeStrings.Get(242), GetFPS()); - return strLabel; - break; -@@ -1620,10 +1620,10 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa - strLabel = g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].strMode; - break; - case SYSTEM_SCREEN_WIDTH: -- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iWidth); -+ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenWidth); - break; - case SYSTEM_SCREEN_HEIGHT: -- strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iHeight); -+ strLabel.Format("%i", g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()].iScreenHeight); - break; - case SYSTEM_CURRENT_WINDOW: - return g_localizeStrings.Get(g_windowManager.GetFocusedWindow()); -diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp -index 31bfdbf..94f248b 100644 ---- a/xbmc/guilib/GraphicContext.cpp -+++ b/xbmc/guilib/GraphicContext.cpp -@@ -580,6 +580,8 @@ void CGraphicContext::ResetScreenParameters(RESOLUTION res) - default: - break; - } -+ g_settings.m_ResInfo[res].iScreenWidth = g_settings.m_ResInfo[res].iWidth; -+ g_settings.m_ResInfo[res].iScreenHeight = g_settings.m_ResInfo[res].iHeight; - ResetOverscan(res, g_settings.m_ResInfo[res].Overscan); - } - -diff --git a/xbmc/guilib/Resolution.h b/xbmc/guilib/Resolution.h -index ede938d..20864e2 100644 ---- a/xbmc/guilib/Resolution.h -+++ b/xbmc/guilib/Resolution.h -@@ -88,6 +88,8 @@ struct RESOLUTION_INFO - int iScreen; - int iWidth; - int iHeight; -+ int iScreenWidth; -+ int iScreenHeight; - int iSubtitles; - uint32_t dwFlags; - float fPixelRatio; -@@ -100,6 +102,8 @@ struct RESOLUTION_INFO - { - iWidth = width; - iHeight = height; -+ iScreenWidth = width; -+ iScreenHeight = height; - fPixelRatio = aspect ? ((float)width)/height / aspect : 1.0f; - strMode = mode; - bFullScreen = true; -@@ -114,6 +118,7 @@ struct RESOLUTION_INFO - { - Overscan = res.Overscan; bFullScreen = res.bFullScreen; - iScreen = res.iScreen; iWidth = res.iWidth; iHeight = res.iHeight; -+ iScreenWidth = res.iScreenWidth; iScreenHeight = res.iScreenHeight; - iSubtitles = res.iSubtitles; dwFlags = res.dwFlags; - fPixelRatio = res.fPixelRatio; fRefreshRate = res.fRefreshRate; - strMode = res.strMode; strOutput = res.strOutput; strId = res.strId; -diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index da2a78b..ec24ad5 100644 ---- a/xbmc/settings/GUISettings.cpp -+++ b/xbmc/settings/GUISettings.cpp -@@ -1526,8 +1526,8 @@ RESOLUTION CGUISettings::GetResFromString(const CStdString &res) - const RESOLUTION_INFO &info = g_settings.m_ResInfo[i]; - if (info.iScreen != screen) - continue; -- float score = 10 * (square_error((float)info.iWidth, (float)width) + -- square_error((float)info.iHeight, (float)height) + -+ float score = 10 * (square_error((float)info.iScreenWidth, (float)width) + -+ square_error((float)info.iScreenHeight, (float)height) + - square_error(info.fRefreshRate, refresh) + - square_error((float)((info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? 100:200), interlaced)); - if (score < bestScore) -@@ -1552,7 +1552,7 @@ void CGUISettings::SetResolution(RESOLUTION res) - { - const RESOLUTION_INFO &info = g_settings.m_ResInfo[res]; - mode.Format("%1i%05i%05i%09.5f%s", info.iScreen, -- info.iWidth, info.iHeight, info.fRefreshRate, -+ info.iScreenWidth, info.iScreenHeight, info.fRefreshRate, - (info.dwFlags & D3DPRESENTFLAG_INTERLACED) ? "i":"p"); - } - else -diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp -index b436b98..ce517bb 100644 ---- a/xbmc/settings/GUIWindowSettingsCategory.cpp -+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp -@@ -2392,8 +2392,8 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa - RESOLUTION_INFO res1 = g_settings.m_ResInfo[res]; - RESOLUTION_INFO res2 = g_settings.m_ResInfo[resolutions[idx].ResInfo_Index]; - if ( res1.iScreen == res2.iScreen -- && res1.iWidth == res2.iWidth -- && res1.iHeight == res2.iHeight -+ && res1.iScreenWidth == res2.iScreenWidth -+ && res1.iScreenHeight == res2.iScreenHeight - && (res1.dwFlags & D3DPRESENTFLAG_INTERLACED) == (res2.dwFlags & D3DPRESENTFLAG_INTERLACED)) - spinres = (RESOLUTION) resolutions[idx].ResInfo_Index; - } -@@ -2430,13 +2430,13 @@ void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, Displa - - void CGUIWindowSettingsCategory::FillInRefreshRates(CStdString strSetting, RESOLUTION res, bool UserChange) - { -- // The only meaningful parts of res here are iScreen, iWidth, iHeight -+ // The only meaningful parts of res here are iScreen, iScreenWidth, iScreenHeight - - vector refreshrates; - if (res > RES_WINDOW) - refreshrates = g_Windowing.RefreshRates(g_settings.m_ResInfo[res].iScreen, -- g_settings.m_ResInfo[res].iWidth, -- g_settings.m_ResInfo[res].iHeight, -+ g_settings.m_ResInfo[res].iScreenWidth, -+ g_settings.m_ResInfo[res].iScreenHeight, - g_settings.m_ResInfo[res].dwFlags); - - // The control setting doesn't exist when not in standalone mode, don't manipulate it -diff --git a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp -index b2430bc..3e6ba83 100644 ---- a/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp -+++ b/xbmc/settings/GUIWindowSettingsScreenCalibration.cpp -@@ -352,12 +352,12 @@ void CGUIWindowSettingsScreenCalibration::UpdateFromControl(int iControl) - // set the label control correctly - CStdString strText; - if (g_Windowing.IsFullScreen()) -- strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth, -- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate, -+ strText.Format("%ix%i@%.2f - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth, -+ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight, g_settings.m_ResInfo[m_Res[m_iCurRes]].fRefreshRate, - g_localizeStrings.Get(244).c_str(), strStatus.c_str()); - else -- strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iWidth, -- g_settings.m_ResInfo[m_Res[m_iCurRes]].iHeight, -+ strText.Format("%ix%i - %s | %s", g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenWidth, -+ g_settings.m_ResInfo[m_Res[m_iCurRes]].iScreenHeight, - g_localizeStrings.Get(242).c_str(), strStatus.c_str()); - - SET_CONTROL_LABEL(CONTROL_LABEL_ROW1, strText); -diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp -index 22a5c35..1bba604 100644 ---- a/xbmc/video/windows/GUIWindowFullScreen.cpp -+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp -@@ -1008,13 +1008,13 @@ void CGUIWindowFullScreen::FrameMove() - CStdString strStatus; - if (g_Windowing.IsFullScreen()) - strStatus.Format("%s %ix%i@%.2fHz - %s", -- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth, -- g_settings.m_ResInfo[iResolution].iHeight, g_settings.m_ResInfo[iResolution].fRefreshRate, -+ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth, -+ g_settings.m_ResInfo[iResolution].iScreenHeight, g_settings.m_ResInfo[iResolution].fRefreshRate, - g_localizeStrings.Get(244)); - else - strStatus.Format("%s %ix%i - %s", -- g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iWidth, -- g_settings.m_ResInfo[iResolution].iHeight, g_localizeStrings.Get(242)); -+ g_localizeStrings.Get(13287), g_settings.m_ResInfo[iResolution].iScreenWidth, -+ g_settings.m_ResInfo[iResolution].iScreenHeight, g_localizeStrings.Get(242)); - - CGUIMessage msg(GUI_MSG_LABEL_SET, GetID(), LABEL_ROW3); - msg.SetLabel(strStatus); -diff --git a/xbmc/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp -index 9882161..6a17586 100644 ---- a/xbmc/windowing/WinSystem.cpp -+++ b/xbmc/windowing/WinSystem.cpp -@@ -63,6 +63,8 @@ void CWinSystemBase::UpdateDesktopResolution(RESOLUTION_INFO& newRes, int screen - newRes.fPixelRatio = 1.0f; - newRes.iWidth = width; - newRes.iHeight = height; -+ newRes.iScreenWidth = width; -+ newRes.iScreenHeight = height; - newRes.strMode.Format("%dx%d", width, height); - if (refreshRate > 1) - newRes.strMode.Format("%s @ %.2f%s - Full Screen", newRes.strMode, refreshRate, dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); -@@ -79,6 +81,8 @@ void CWinSystemBase::UpdateResolutions() - window.iWidth = 720; - if (window.iHeight == 0) - window.iHeight = 480; -+ window.iScreenWidth = window.iWidth; -+ window.iScreenHeight = window.iHeight; - if (window.iSubtitles == 0) - window.iSubtitles = (int)(0.965 * window.iHeight); - window.fPixelRatio = 1.0f; -@@ -90,6 +94,8 @@ void CWinSystemBase::SetWindowResolution(int width, int height) - RESOLUTION_INFO& window = g_settings.m_ResInfo[RES_WINDOW]; - window.iWidth = width; - window.iHeight = height; -+ window.iScreenWidth = width; -+ window.iScreenHeight = height; - window.iSubtitles = (int)(0.965 * window.iHeight); - g_graphicsContext.ResetOverscan(window); - } -@@ -105,8 +111,8 @@ int CWinSystemBase::DesktopResolution(int screen) - - static void AddResolution(vector &resolutions, unsigned int addindex) - { -- int width = g_settings.m_ResInfo[addindex].iWidth; -- int height = g_settings.m_ResInfo[addindex].iHeight; -+ int width = g_settings.m_ResInfo[addindex].iScreenWidth; -+ int height = g_settings.m_ResInfo[addindex].iScreenHeight; - int interlaced = g_settings.m_ResInfo[addindex].dwFlags & D3DPRESENTFLAG_INTERLACED; - - for (unsigned int idx = 0; idx < resolutions.size(); idx++) -@@ -163,8 +169,8 @@ static bool rrSortPredicate(REFRESHRATE i, REFRESHRATE j) - - for (unsigned int idx = RES_DESKTOP; idx < g_settings.m_ResInfo.size(); idx++) - if ( g_settings.m_ResInfo[idx].iScreen == screen -- && g_settings.m_ResInfo[idx].iWidth == width -- && g_settings.m_ResInfo[idx].iHeight == height -+ && g_settings.m_ResInfo[idx].iScreenWidth == width -+ && g_settings.m_ResInfo[idx].iScreenHeight == height - && (g_settings.m_ResInfo[idx].dwFlags & D3DPRESENTFLAG_INTERLACED) == (dwFlags & D3DPRESENTFLAG_INTERLACED)) - AddRefreshRate(refreshrates, idx); - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 889c445..a839709 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -269,6 +269,8 @@ void CWinSystemX11::UpdateResolutions() - RESOLUTION_INFO res; - res.iWidth = mode.w; - res.iHeight = mode.h; -+ res.iScreenWidth = mode.w; -+ res.iScreenHeight = mode.h; - if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0) - res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h)); - else -diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp -index 2b67e37..50185f9 100644 ---- a/xbmc/windowing/X11/WinSystemX11GLES.cpp -+++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp -@@ -292,6 +292,8 @@ void CWinSystemX11GLES::UpdateResolutions() - RESOLUTION_INFO res; - res.iWidth = mode.w; - res.iHeight = mode.h; -+ res.iScreenWidth = mode.w; -+ res.iScreenHeight = mode.h; - if (mode.h>0 && mode.w>0 && out.hmm>0 && out.wmm>0) - res.fPixelRatio = ((float)out.wmm/(float)mode.w) / (((float)out.hmm/(float)mode.h)); - else -diff --git a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp -index 9febe15..b6dec7e 100644 ---- a/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp -+++ b/xbmc/windowing/egl/WinEGLPlatformGeneric.cpp -@@ -43,8 +43,8 @@ - m_desktopRes.iScreen = 0; - m_desktopRes.iWidth = 1280; - m_desktopRes.iHeight = 720; -- //m_desktopRes.iScreenWidth = 1280; -- //m_desktopRes.iScreenHeight = 720; -+ m_desktopRes.iScreenWidth = 1280; -+ m_desktopRes.iScreenHeight = 720; - m_desktopRes.fRefreshRate = 60.0f; - m_desktopRes.bFullScreen = true; - m_desktopRes.iSubtitles = (int)(0.965 * 720); -@@ -101,12 +101,9 @@ bool CWinEGLPlatformGeneric::ProbeDisplayResolutions(std::vector 1) - { -@@ -687,8 +689,8 @@ void CWinEGLPlatformRaspberryPI::GetSupportedModes(HDMI_RES_GROUP_T group, std:: - res.fPixelRatio = 1.0f; - res.iWidth = width; - res.iHeight = tv->height; -- //res.iScreenWidth = width; -- //res.iScreenHeight = tv->height; -+ res.iScreenWidth = width; -+ res.iScreenHeight = tv->height; - res.strMode.Format("%dx%d", width, tv->height); - if((float)tv->frame_rate > 1) - { -diff --git a/xbmc/windowing/egl/WinSystemGLES.cpp b/xbmc/windowing/egl/WinSystemGLES.cpp -index d4f1f04..eb78f74 100644 ---- a/xbmc/windowing/egl/WinSystemGLES.cpp -+++ b/xbmc/windowing/egl/WinSystemGLES.cpp -@@ -78,7 +78,11 @@ bool CWinSystemGLES::DestroyWindowSystem() - - bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) - { -- if (m_bWindowCreated && m_nWidth == res.iWidth && m_nHeight == res.iHeight && m_fRefreshRate == res.fRefreshRate && m_bFullScreen == fullScreen) -+ if (m_bWindowCreated && -+ m_nWidth == res.iWidth && m_nHeight == res.iHeight && -+ m_nScreenWidth == res.iScreenWidth && m_nScreenHeight == res.iScreenHeight && -+ m_bFullScreen == fullScreen && -+ m_fRefreshRate == res.fRefreshRate) - { - CLog::Log(LOGDEBUG, "CWinSystemGLES::CreateNewWindow: No need to create a new window"); - return true; -@@ -86,8 +90,10 @@ bool CWinSystemGLES::CreateNewWindow(const CStdString& name, bool fullScreen, RE - - m_nWidth = res.iWidth; - m_nHeight = res.iHeight; -- m_bFullScreen = fullScreen; -- m_fRefreshRate = res.fRefreshRate; -+ m_nScreenWidth = res.iScreenWidth; -+ m_nScreenHeight = res.iScreenHeight; -+ m_bFullScreen = fullScreen; -+ m_fRefreshRate = res.fRefreshRate; - - // Destroy any existing window - if (m_bWindowCreated) -@@ -138,7 +144,6 @@ void CWinSystemGLES::UpdateResolutions() - { - CWinSystemBase::UpdateResolutions(); - -- //std::vector resolutions; - std::vector resolutions; - - m_eglplatform->ProbeDisplayResolutions(resolutions); -@@ -148,9 +153,6 @@ void CWinSystemGLES::UpdateResolutions() - RESOLUTION ResDesktop = RES_INVALID; - RESOLUTION res_index = RES_DESKTOP; - -- // Clear old resolutions -- //g_settings.m_ResInfo.clear(); -- - for (size_t i = 0; i < resolutions.size(); i++) - { - int gui_width = resolutions[i].iWidth; -@@ -173,17 +175,23 @@ void CWinSystemGLES::UpdateResolutions() - g_graphicsContext.ResetOverscan(resolutions[i]); - g_settings.m_ResInfo[res_index] = resolutions[i]; - -- CLog::Log(LOGNOTICE, "Found resolution for display %d with %d x %d @ %f Hz\n", -+ CLog::Log(LOGNOTICE, "Found resolution %d x %d for display %d with %d x %d%s @ %f Hz\n", - resolutions[i].iScreen, - resolutions[i].iWidth, - resolutions[i].iHeight, -+ resolutions[i].iScreenWidth, -+ resolutions[i].iScreenHeight, -+ resolutions[i].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "", - resolutions[i].fRefreshRate); - - if(m_eglplatform->FixedDesktop()) - { - if(resDesktop.iWidth == resolutions[i].iWidth && - resDesktop.iHeight == resolutions[i].iHeight && -- resDesktop.fRefreshRate == resolutions[i].fRefreshRate) -+ resDesktop.iScreenWidth == resolutions[i].iScreenWidth && -+ resDesktop.iScreenHeight == resolutions[i].iScreenHeight && -+ resDesktop.fRefreshRate == resolutions[i].fRefreshRate && -+ resDesktop.dwFlags == resolutions[i].dwFlags) - { - ResDesktop = res_index; - } -@@ -195,8 +203,11 @@ void CWinSystemGLES::UpdateResolutions() - // swap desktop index for desktop res if available - if (ResDesktop != RES_INVALID) - { -- CLog::Log(LOGNOTICE, "Found (%dx%d@%f) at %d, setting to RES_DESKTOP at %d", -- resDesktop.iWidth, resDesktop.iHeight, resDesktop.fRefreshRate, (int)ResDesktop, (int)RES_DESKTOP); -+ CLog::Log(LOGNOTICE, "Found (%dx%d%s@%f) at %d, setting to RES_DESKTOP at %d", -+ resDesktop.iWidth, resDesktop.iHeight, -+ resDesktop.dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "", -+ resDesktop.fRefreshRate, -+ (int)ResDesktop, (int)RES_DESKTOP); - - RESOLUTION_INFO desktop = g_settings.m_ResInfo[RES_DESKTOP]; - g_settings.m_ResInfo[RES_DESKTOP] = g_settings.m_ResInfo[ResDesktop]; -diff --git a/xbmc/windowing/egl/WinSystemGLES.h b/xbmc/windowing/egl/WinSystemGLES.h -index d94d24d..72c1eb7 100644 ---- a/xbmc/windowing/egl/WinSystemGLES.h -+++ b/xbmc/windowing/egl/WinSystemGLES.h -@@ -63,6 +63,8 @@ class CWinSystemGLES : public CWinSystemBase, public CRenderSystemGLES - void *m_display; - EGLNativeWindowType m_window; - CWinEGLPlatform *m_eglplatform; -+ int m_nScreenWidth; -+ int m_nScreenHeight; - }; - - XBMC_GLOBAL_REF(CWinSystemGLES,g_Windowing); -diff --git a/xbmc/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp -index 6a0e335..182b9a2 100644 ---- a/xbmc/windowing/windows/WinSystemWin32.cpp -+++ b/xbmc/windowing/windows/WinSystemWin32.cpp -@@ -541,6 +541,8 @@ void CWinSystemWin32::AddResolution(const RESOLUTION_INFO &res) - if (g_settings.m_ResInfo[i].iScreen == res.iScreen && - g_settings.m_ResInfo[i].iWidth == res.iWidth && - g_settings.m_ResInfo[i].iHeight == res.iHeight && -+ g_settings.m_ResInfo[i].iScreenWidth == res.iScreenWidth && -+ g_settings.m_ResInfo[i].iScreenHeight== res.iScreenHeight && - g_settings.m_ResInfo[i].fRefreshRate == res.fRefreshRate && - g_settings.m_ResInfo[i].dwFlags == res.dwFlags) - return; // already have this resolution --- -1.7.10 - diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1426.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1426.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1435.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63b6ee7-901-PR1435.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1435.patch From debf0ea2a7eb2038dda6842b3bc488fce43b53b0 Mon Sep 17 00:00:00 2001 From: newphreak Date: Sat, 29 Sep 2012 19:00:25 +0300 Subject: [PATCH 16/25] xorg.conf: Remove YCbCr444 as it should never be used. --- packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf index 54e3205c82..19958df7ef 100644 --- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf @@ -24,7 +24,6 @@ Section "Screen" Option "ColorRange" "Full" # Option "ColorRange" "Limited" # Option "ColorSpace" "RGB" -# Option "ColorSpace" "YCbCr444" SubSection "Display" Depth 24 EndSubSection From 0af8ac461b438438c9a0dc644d8d8085c30042cc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 21:09:16 +0200 Subject: [PATCH 17/25] new package: add package 'iproute2' Signed-off-by: Stephan Raue --- packages/debug/iproute2/build | 43 +++++++++++++++++++++++++++ packages/debug/iproute2/install | 51 +++++++++++++++++++++++++++++++++ packages/debug/iproute2/meta | 36 +++++++++++++++++++++++ packages/network/install | 4 +++ 4 files changed, 134 insertions(+) create mode 100755 packages/debug/iproute2/build create mode 100755 packages/debug/iproute2/install create mode 100644 packages/debug/iproute2/meta diff --git a/packages/debug/iproute2/build b/packages/debug/iproute2/build new file mode 100755 index 0000000000..a5b08acb3a --- /dev/null +++ b/packages/debug/iproute2/build @@ -0,0 +1,43 @@ +#!/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 + +cd $PKG_BUILD + +$SED 's/$(CCOPTS)//' netem/Makefile + +# remove any old configfile + rm -rf ./Config + +# Makefile is busted so it never passes IPT_LIB_DIR properly + $SED "s/-DIPT/-DXT/" tc/Makefile + echo "TC_CONFIG_XT:=y" >> ./Config + +# arpd needs berkeleydb + $SED "/^TARGETS=/s: arpd : :" misc/Makefile + echo "IPT_LIB_DIR:=/usr/lib/xtables" >> ./Config + +# use setns from our libc + echo "IP_CONFIG_SETNS:=y" >> ./Config + +make CC="$TARGET_CC" CCOPTS="$TARGET_CFLAGS -D_GNU_SOURCE" diff --git a/packages/debug/iproute2/install b/packages/debug/iproute2/install new file mode 100755 index 0000000000..ce64bbbddc --- /dev/null +++ b/packages/debug/iproute2/install @@ -0,0 +1,51 @@ +#!/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 $INSTALL/etc/iproute2 + cp -P $PKG_BUILD/etc/iproute2/* $INSTALL/etc/iproute2 + +mkdir -p $INSTALL/sbin + cp -P $PKG_BUILD/bridge/bridge $INSTALL/sbin + cp -P $PKG_BUILD/genl/genl $INSTALL/sbin + cp -P $PKG_BUILD/ip/ip $INSTALL/sbin + cp -P $PKG_BUILD/ip/rtmon $INSTALL/sbin + cp -P $PKG_BUILD/ip/routef $INSTALL/sbin + chmod +x $INSTALL/sbin/routef + cp -P $PKG_BUILD/ip/routel $INSTALL/sbin + chmod +x $INSTALL/sbin/routel + cp -P $PKG_BUILD/ip/rtpr $INSTALL/sbin + chmod +x $INSTALL/sbin/rtpr + cp -P $PKG_BUILD/misc/ifstat $INSTALL/sbin + cp -P $PKG_BUILD/misc/lnstat $INSTALL/sbin + ln -sf lnstat $INSTALL/sbin/ctstat + ln -sf lnstat $INSTALL/sbin/rtstat + cp -P $PKG_BUILD/misc/nstat $INSTALL/sbin + cp -P $PKG_BUILD/misc/rtacct $INSTALL/sbin + cp -P $PKG_BUILD/misc/ss $INSTALL/sbin + cp -P $PKG_BUILD/tc/tc $INSTALL/sbin + +mkdir -p $INSTALL/usr/lib/tc + cp -P $PKG_BUILD/netem/*.dist $INSTALL/usr/lib/tc + cp -P $PKG_BUILD/tc/m_xt.so $INSTALL/usr/lib/tc + ln -sf m_xt.so $INSTALL/usr/lib/tc/m_ipt.so \ No newline at end of file diff --git a/packages/debug/iproute2/meta b/packages/debug/iproute2/meta new file mode 100644 index 0000000000..cde226537f --- /dev/null +++ b/packages/debug/iproute2/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="iproute2" +PKG_VERSION="3.5.1" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +PKG_URL="http://kernel.org/pub/linux/utils/net/iproute2/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="iptables" +PKG_BUILD_DEPENDS="toolchain iptables" +PKG_PRIORITY="optional" +PKG_SECTION="debug" +PKG_SHORTDESC="iproute2:a collection of utilities for controlling TCP / IP networking and traffic control in Linux." +PKG_LONGDESC="Iproute2 is a collection of utilities for controlling TCP / IP networking and traffic control in Linux." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/network/install b/packages/network/install index c7da8d55fa..6fd8ab149f 100755 --- a/packages/network/install +++ b/packages/network/install @@ -29,3 +29,7 @@ $SCRIPTS/install openssh if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then $SCRIPTS/install bluez fi + +if [ "$DEVTOOLS" = "yes" ]; then + $SCRIPTS/install iproute2 +fi From 5aa596e6b49e516e827b4484584bd152b3be6adf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 21:09:46 +0200 Subject: [PATCH 18/25] xbmc: fix audio delays issue Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/config/advancedsettings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml index c6f22f0a3a..8027b986e4 100644 --- a/packages/mediacenter/xbmc/config/advancedsettings.xml +++ b/packages/mediacenter/xbmc/config/advancedsettings.xml @@ -4,6 +4,16 @@ false cputemp gputemp + 30 From c3796bf8b0418656da9b24ac37e7d0787fc805bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 21:09:57 +0200 Subject: [PATCH 19/25] xbmc-frodo: fix audio delays issue Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-frodo/config/advancedsettings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/mediacenter/xbmc-frodo/config/advancedsettings.xml b/packages/mediacenter/xbmc-frodo/config/advancedsettings.xml index c6f22f0a3a..8027b986e4 100644 --- a/packages/mediacenter/xbmc-frodo/config/advancedsettings.xml +++ b/packages/mediacenter/xbmc-frodo/config/advancedsettings.xml @@ -4,6 +4,16 @@ false cputemp gputemp + 30 From 67952e83c651742e4044dfaf607a7fa18d556442 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 21:10:34 +0200 Subject: [PATCH 20/25] xbmc-rpi: remove borked leftovers Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-rpi/init.d/93_xbmc | 0 packages/mediacenter/xbmc-rpi/install | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/mediacenter/xbmc-rpi/init.d/93_xbmc delete mode 100755 packages/mediacenter/xbmc-rpi/install diff --git a/packages/mediacenter/xbmc-rpi/init.d/93_xbmc b/packages/mediacenter/xbmc-rpi/init.d/93_xbmc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mediacenter/xbmc-rpi/install b/packages/mediacenter/xbmc-rpi/install deleted file mode 100755 index e69de29bb2..0000000000 From ecb0e98b22222571b339e4713f14adc36a77bb89 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 21:16:51 +0200 Subject: [PATCH 21/25] xf86-video-intel: update to xf86-video-intel-2.20.9 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 9db5c797ff..ad4853dac1 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.20.8" +PKG_VERSION="2.20.9" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 2b5d21e8f2e0bbd3fdb14678d091b0ed150d1e75 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 29 Sep 2012 22:06:44 +0200 Subject: [PATCH 22/25] projects/*/linux: add NET emulator support Signed-off-by: Stephan Raue --- packages/linux/unpack | 2 ++ projects/ATV/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/Fusion/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/Fusion/linux/linux.x86_64.conf | 39 +++++++++++++++++++++- projects/Generic/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/Generic_OSS/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/ION/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/ION/linux/linux.x86_64.conf | 39 +++++++++++++++++++++- projects/Intel/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/Intel/linux/linux.x86_64.conf | 39 +++++++++++++++++++++- projects/RPi/linux/linux.arm.conf | 39 +++++++++++++++++++++- projects/Ultra/linux/linux.x86_64.conf | 39 +++++++++++++++++++++- projects/Virtual/linux/linux.i386.conf | 39 +++++++++++++++++++++- projects/Virtual/linux/linux.x86_64.conf | 39 +++++++++++++++++++++- 14 files changed, 496 insertions(+), 13 deletions(-) diff --git a/packages/linux/unpack b/packages/linux/unpack index 9e3d3920fe..e5972a59fc 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -49,6 +49,8 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD # dont install some debug stuff on release builds if [ ! "$DEVTOOLS" = yes ]; then sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config + sed -i -e "s|^CONFIG_NET_SCHED=.*$|# CONFIG_NET_SCHED is not set|" $LINUX/.config + sed -i -e "s|^CONFIG_NET_SCH_NETEM=.*$|# CONFIG_NET_SCH_NETEM is not set|" $LINUX/.config fi # copy some extra firmware to linux tree diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index e9808d8979..1a129c55b9 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -653,7 +653,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index e2afb36b13..8b3f952033 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -654,7 +654,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 911f9b619f..84f4003129 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -614,7 +614,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index e9f7d165b2..06eaa0d2de 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -658,7 +658,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 204a6b45c4..7fdb94dc21 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -658,7 +658,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 10eaf56a72..9ec27bbdac 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -654,7 +654,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 74e69e7e10..62c93240e7 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -603,7 +603,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index c0d5d04622..8913329a99 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -656,7 +656,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 182efed264..6a84025a2c 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -606,7 +606,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index e2a298c909..8371ed42d2 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -500,7 +500,44 @@ CONFIG_VLAN_8021Q=y # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 20d5691739..d595be6de4 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -603,7 +603,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 47084822d6..4c88559e9f 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -654,7 +654,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index c750dfedaf..5471cbcd70 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -603,7 +603,44 @@ CONFIG_VLAN_8021Q=m # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=y +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set From 32e29ef685de4fa9daabba4db66832376f3fc74b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 30 Sep 2012 15:17:14 +0200 Subject: [PATCH 23/25] xbmc-frodo: update to xbmc-frodo-942a938 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-frodo-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- ...-frodo-942a938-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...patch => xbmc-frodo-942a938-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ....1.patch => xbmc-frodo-942a938-311-fix_rsxs_build-0.1.patch} | 0 ...-frodo-942a938-321-texturepacker-hostflags-and-rework.patch} | 0 ...38-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...atch => xbmc-frodo-942a938-452-change_lcd_content-0.1.patch} | 0 ...> xbmc-frodo-942a938-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...patch => xbmc-frodo-942a938-454-disable_backslash-0.1.patch} | 0 ...ch => xbmc-frodo-942a938-457-fix_connection_check-0.1.patch} | 0 ...tch => xbmc-frodo-942a938-463-add_remote_devinput-0.1.patch} | 0 ...8a9-901-PR1426.patch => xbmc-frodo-942a938-901-PR1426.patch} | 0 ...8a9-901-PR1435.patch => xbmc-frodo-942a938-901-PR1435.patch} | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-frodo-942a938-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-frodo-942a938-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch => xbmc-frodo-942a938-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch => xbmc-frodo-942a938-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-frodo-942a938-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch => xbmc-frodo-942a938-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-frodo-942a938-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch => xbmc-frodo-942a938-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch => xbmc-frodo-942a938-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch => xbmc-frodo-942a938-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-901-PR1426.patch => xbmc-frodo-942a938-901-PR1426.patch} (100%) rename packages/mediacenter/xbmc-frodo/patches/{xbmc-frodo-f5538a9-901-PR1435.patch => xbmc-frodo-942a938-901-PR1435.patch} (100%) diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta index 73784cec66..08e71cdd3e 100644 --- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo-theme-Confluence" -PKG_VERSION="f5538a9" +PKG_VERSION="942a938" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 89f6878722..e28f2c60dc 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-frodo" -PKG_VERSION="f5538a9" +PKG_VERSION="942a938" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1426.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-901-PR1426.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1426.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-901-PR1426.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1435.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-901-PR1435.patch similarity index 100% rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f5538a9-901-PR1435.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-942a938-901-PR1435.patch From 3faaaf8c3d5c9c1e6a11cc9d4bf774704d0647b8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 30 Sep 2012 15:17:54 +0200 Subject: [PATCH 24/25] projects/RPi/xbmc: add some recommended advancedsettings.xml defaults Signed-off-by: Stephan Raue --- projects/RPi/xbmc/advancedsettings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/projects/RPi/xbmc/advancedsettings.xml b/projects/RPi/xbmc/advancedsettings.xml index abc74fa1ab..d4af462b5c 100644 --- a/projects/RPi/xbmc/advancedsettings.xml +++ b/projects/RPi/xbmc/advancedsettings.xml @@ -12,6 +12,16 @@ 2 true + + + + 5282880 From d2dac490d10f4f79cad358cb31623971cc260d85 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 30 Sep 2012 15:59:49 +0200 Subject: [PATCH 25/25] scripts/checkdeps: install package 'default-jre' on ubuntu Signed-off-by: Stephan Raue --- scripts/checkdeps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index a2a80b8f89..28664423b5 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -34,7 +34,7 @@ case $1 in ;; build) deps="gcc g++ sed patch touch tar bzip2 gzip perl cp gawk makeinfo gperf cvs zip unzip mkfontscale diff xsltproc java" - deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils diff xsltproc sun-java6-jre" + deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils diff xsltproc default-jre" files="/usr/include/stdio.h /usr/include/ncurses.h" files_pkg="libc6-dev libncurses5-dev" ;;