From 4f7ad1833fda521e3b1e71d658aa9328de81d291 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 28 Feb 2013 16:29:24 +0200 Subject: [PATCH 01/12] vdr: clean up build depends --- packages/3rdparty/multimedia/vdr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr/meta b/packages/3rdparty/multimedia/vdr/meta index ca4a90f071..5734d817f5 100644 --- a/packages/3rdparty/multimedia/vdr/meta +++ b/packages/3rdparty/multimedia/vdr/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.tvdr.de" PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="fontconfig freetype libcap" -PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat" +PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" From 2f9488c28485d2bd9a3a88710959c3ca1876f13e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 19:08:04 +0100 Subject: [PATCH 02/12] projects/*/linux: disable CONFIG_8139TOO_PIO and CONFIG_8139TOO_TUNE_TWISTER Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 6 +++--- projects/Generic/linux/linux.i386.conf | 4 ++-- projects/Generic_OSS/linux/linux.i386.conf | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index a387d5154a..8c9b2a016f 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1190,8 +1190,8 @@ CONFIG_ETHERNET=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -CONFIG_8139TOO_TUNE_TWISTER=y +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set # CONFIG_R8169 is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 75a4dd5a4c..430acef932 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1257,8 +1257,8 @@ CONFIG_QLA3XXX=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -CONFIG_8139TOO_TUNE_TWISTER=y +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 26d7633674..8f66a7364d 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1255,8 +1255,8 @@ CONFIG_QLA3XXX=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -CONFIG_8139TOO_TUNE_TWISTER=y +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=y From 22d10112deb3108f9639405f6ffd0c63d7db06bf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 19:14:32 +0100 Subject: [PATCH 03/12] projects/ATV/linux, projects/Ultra/linux: disable firewire support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 12 +----------- projects/Ultra/linux/linux.x86_64.conf | 14 ++------------ 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 8c9b2a016f..69c1ad4de6 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1129,10 +1129,7 @@ CONFIG_PATA_ACPI=y # # IEEE 1394 (FireWire) support # -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -# CONFIG_FIREWIRE_NET is not set +# CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set @@ -1885,11 +1882,6 @@ CONFIG_TTPCI_EEPROM=m # # Supported MMC/SDIO adapters # - -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set CONFIG_DVB_B2C2_FLEXCOP=m # CONFIG_SAA716X_SUPPORT is not set CONFIG_SMS_SIANO_MDTV=m @@ -2317,7 +2309,6 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_US122L is not set # CONFIG_SND_USB_6FIRE is not set -# CONFIG_SND_FIREWIRE is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set @@ -3086,7 +3077,6 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 54096f440a..64c5b5d7af 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.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1080,10 +1080,7 @@ CONFIG_ATA_GENERIC=y # # IEEE 1394 (FireWire) support # -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -# CONFIG_FIREWIRE_NET is not set +# CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set @@ -1941,11 +1938,6 @@ CONFIG_TTPCI_EEPROM=m # # Supported MMC/SDIO adapters # - -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_SAA716X_SUPPORT=y CONFIG_SAA716X_CORE=m @@ -2358,7 +2350,6 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_US122L is not set # CONFIG_SND_USB_6FIRE is not set -# CONFIG_SND_FIREWIRE is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set @@ -3136,7 +3127,6 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set From c566394ae42beeb29ee0b929e57278d2874ff411 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 19:37:57 +0100 Subject: [PATCH 04/12] projects/*/linux: disable X86_SMAP support Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 9874cb61d1..85d62e74fc 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index ff376aa409..aa400bfaff 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -420,7 +420,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 2bae30e5f4..c51fa02f26 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -393,7 +393,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 430acef932..0e5dcc63c1 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -424,7 +424,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 8f66a7364d..687b99b42c 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -424,7 +424,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 167387f8b1..081382f08c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -422,7 +422,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 1e082abdb0..75d50c8e9c 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 2154a68c67..47c922d217 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -423,7 +423,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 181db8c402..28928fff7e 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -390,7 +390,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 64c5b5d7af..250ed69b7a 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -388,7 +388,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 3ccacfae4f..325afb3923 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -421,7 +421,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 7723fb6ec2..de2d155b63 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -387,7 +387,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y From 0155cd74add0844fa3548df06ec10d1d5dac9c2d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 19:57:42 +0100 Subject: [PATCH 05/12] projects/*/linux: disable X86_SMAP support Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 13 ++----------- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 13 ++----------- projects/Fusion/linux/linux.x86_64.conf | 13 ++----------- projects/Generic/linux/linux.i386.conf | 13 ++----------- projects/Generic_OSS/linux/linux.i386.conf | 13 ++----------- projects/ION/linux/linux.i386.conf | 13 ++----------- projects/ION/linux/linux.x86_64.conf | 13 ++----------- projects/Intel/linux/linux.i386.conf | 13 ++----------- projects/Intel/linux/linux.x86_64.conf | 13 ++----------- projects/Ultra/linux/linux.x86_64.conf | 11 +---------- projects/Virtual/linux/linux.i386.conf | 13 ++----------- projects/Virtual/linux/linux.x86_64.conf | 13 ++----------- 13 files changed, 24 insertions(+), 132 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 85d62e74fc..77dbfe7842 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2928,14 +2928,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3010,7 +3003,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3032,7 +3024,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 69c1ad4de6..14320026a5 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -430,7 +430,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y +# CONFIG_X86_SMAP is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index aa400bfaff..7b08355dc2 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3151,14 +3151,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3233,7 +3226,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3255,7 +3247,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index c51fa02f26..55d7ea260b 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.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3095,14 +3095,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3177,7 +3170,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3199,7 +3191,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 0e5dcc63c1..2dff2615bd 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3333,14 +3333,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3415,7 +3408,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3437,7 +3429,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 687b99b42c..615fa56c49 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3336,14 +3336,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3418,7 +3411,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3440,7 +3432,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 081382f08c..b8e91916c4 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3181,14 +3181,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3263,7 +3256,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3285,7 +3277,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 75d50c8e9c..f73b946889 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.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3107,14 +3107,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3189,7 +3182,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3211,7 +3203,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 47c922d217..bf350d9833 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3228,14 +3228,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3310,7 +3303,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3332,7 +3324,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 28928fff7e..958f5e3526 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.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3155,14 +3155,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3237,7 +3230,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3259,7 +3251,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 250ed69b7a..9baa062590 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -2884,14 +2884,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -2966,7 +2959,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -2988,7 +2980,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 325afb3923..a0ce12e9d9 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.7.6 Kernel Configuration +# Linux/i386 3.7.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3225,14 +3225,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3307,7 +3300,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3329,7 +3321,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index de2d155b63..9667201d84 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.7.6 Kernel Configuration +# Linux/x86_64 3.7.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3151,14 +3151,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -3233,7 +3226,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -3255,7 +3247,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set From 8712868362ebfb0b6bd9f6c4e14354a28b616055 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 20:00:09 +0100 Subject: [PATCH 06/12] projects/*/linux: disable FSCACHE support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 11 +---------- projects/RPi/linux/linux.arm.conf | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 14320026a5..00826e0ee1 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -2835,14 +2835,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -2917,7 +2910,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -2939,7 +2931,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_CIFS_SMB2 is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index ef2cd3f575..1bb9ea523c 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -2172,14 +2172,7 @@ CONFIG_FUSE_FS=y # # Caches # -CONFIG_FSCACHE=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set +# CONFIG_FSCACHE is not set # # CD-ROM/DVD Filesystems @@ -2252,7 +2245,6 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_ROOT_NFS=y -CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFSD is not set @@ -2273,7 +2265,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set From ac61c983401e969355969b1112c49a6feb53386f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 28 Feb 2013 20:08:06 +0100 Subject: [PATCH 07/12] projects/*/linux: remove deprecated kernel commandline options Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 77dbfe7842..b46c62d08f 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 00826e0ee1..b3d8871a69 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -448,7 +448,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_HOTPLUG_CPU is not set # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs processor.max_cstate=2" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2" # CONFIG_CMDLINE_OVERRIDE is not set # diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 7b08355dc2..7d86a7fd7f 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -439,7 +439,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 55d7ea260b..7d7b9faae8 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -412,7 +412,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 2dff2615bd..21f53f33d0 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -443,7 +443,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 615fa56c49..04283ed507 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -443,7 +443,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index b8e91916c4..6a13bd2325 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -441,7 +441,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index f73b946889..9861af854f 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index bf350d9833..ef78acab51 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -442,7 +442,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 958f5e3526..0df18c9c11 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -408,7 +408,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 9baa062590..d755480cc1 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -406,7 +406,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index a0ce12e9d9..4d280cc891 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -440,7 +440,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 9667201d84..bba2e7407e 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -405,7 +405,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs" +CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init" # CONFIG_CMDLINE_OVERRIDE is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y From dc19d7cfe18b8bd4cf157c66e9b816163abd4ead Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 1 Mar 2013 17:59:08 +0100 Subject: [PATCH 08/12] wlan-firmware: update to wlan-firmware-0.0.10, this should fix #1973 Signed-off-by: Stephan Raue --- packages/linux-firmware/wlan-firmware/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta index 2afc7f8a27..e82a82e1d4 100644 --- a/packages/linux-firmware/wlan-firmware/meta +++ b/packages/linux-firmware/wlan-firmware/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="wlan-firmware" -PKG_VERSION="0.0.9" +PKG_VERSION="0.0.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" From f9eab5d248fbb101ad71f8dc5b7da197ff8dcbc7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 1 Mar 2013 18:44:44 +0100 Subject: [PATCH 09/12] xbmc: add PR2323 Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.15-PR2323.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.15-PR2323.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.15-PR2323.patch b/packages/mediacenter/xbmc/patches/xbmc-990.15-PR2323.patch new file mode 100644 index 0000000000..d8e6762441 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.15-PR2323.patch @@ -0,0 +1,47 @@ +--- xbmc-12.0.3/configure.in.orig 2013-03-01 13:21:58.791312360 +0100 ++++ xbmc-12.0.3/configure.in 2013-03-01 13:38:41.138311757 +0100 +@@ -990,9 +990,15 @@ + AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library)) + if echo "$ARCH" | grep -q freebsd; then + AC_CHECK_LIB([pthread], [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library)) ++AC_CHECK_LIB([pthread], [pthread_set_name_np], ++ AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP],[1],["Define to 1 if pthread has pthread_set_name_np"]), ++ AC_MSG_RESULT([Could not find pthread_set_name_np in pthread])) + else + if test "$target_platform" != "target_android" ; then + AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) ++ AC_CHECK_LIB([pthread], [pthread_setname_np], ++ AC_DEFINE([HAVE_PTHREAD_SETNAME_NP],[1],["Define to 1 if pthread has pthread_setname_np"]), ++ AC_MSG_RESULT([Could not find pthread_setname_np in pthread])) + fi + fi + AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) +--- xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2013-03-01 14:40:50.080309513 +0100 ++++ xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp 2013-03-01 14:40:20.548309531 +0100 +@@ -18,6 +18,9 @@ + * + */ + ++#if (defined HAVE_CONFIG_H) && (!defined WIN32) ++ #include "config.h" ++#endif + #include + #if defined(TARGET_ANDROID) + #include +@@ -71,10 +74,16 @@ + m_ThreadOpaque.LwpId = syscall(SYS_gettid); + #endif + ++#if defined(HAVE_PTHREAD_SETNAME_NP) + #ifdef TARGET_DARWIN + #if(__MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30200) + pthread_setname_np(m_ThreadName.c_str()); + #endif ++#else ++ pthread_setname_np(m_ThreadId, m_ThreadName.c_str()); ++#endif ++#elif defined(HAVE_PTHREAD_SET_NAME_NP) ++ pthread_set_name_np(m_ThreadId, m_ThreadName.c_str()); + #endif + + #ifdef RLIMIT_NICE From e6bcfb83fd2a82927049e25cf2c74d9936fda4cd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 1 Mar 2013 18:46:01 +0100 Subject: [PATCH 10/12] xbmc: dont clean temp dir on boot Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/init.d/92_setup-xbmc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc index d0c6163031..2af3d091c5 100644 --- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc +++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc @@ -24,15 +24,6 @@ progress "setup XBMC" -# -# clean temp dir -# - # hack... we should always clean this temp dir, but we should keep - # the logfiles in debug mode - if [ ! "$DEBUG" = "yes" ]; then - rm -rf $HOME/.xbmc/temp/* - fi - # # add some default settings # From 107e046f4376ff3bfe0314b817d6ac0a1a7437c9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 1 Mar 2013 18:49:21 +0100 Subject: [PATCH 11/12] libcec: update to libcec-2.1.0 Signed-off-by: Stephan Raue --- packages/devel/libcec/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/libcec/meta b/packages/devel/libcec/meta index e175abeb2b..6734963e2c 100644 --- a/packages/devel/libcec/meta +++ b/packages/devel/libcec/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libcec" -PKG_VERSION="2.0.5" +PKG_VERSION="2.1.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 04102ad87450f6f3abb57e71e39a4c8c0d381b46 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 1 Mar 2013 20:07:16 +0100 Subject: [PATCH 12/12] xbmc: add PR2353 Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.16-PR2353.patch | 309 ++++++++++++++++++ 1 file changed, 309 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch b/packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch new file mode 100644 index 0000000000..27aca80295 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch @@ -0,0 +1,309 @@ +From 0a2c144355ed750e61fadabe2dde185a76064f0a Mon Sep 17 00:00:00 2001 +From: montellese +Date: Fri, 1 Mar 2013 17:53:54 +0100 +Subject: [PATCH] websocket: fix inability to handle multiple queued websocket + frames/messages (fixes #13848) + +--- + xbmc/network/TCPServer.cpp | 31 +++--- + xbmc/network/websocket/WebSocket.cpp | 174 +++++++++++++++++++--------------- + xbmc/network/websocket/WebSocket.h | 2 +- + 3 files changed, 114 insertions(+), 93 deletions(-) + +diff --git a/xbmc/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp +index 2d9fde0..e4b5984 100644 +--- a/xbmc/network/TCPServer.cpp ++++ b/xbmc/network/TCPServer.cpp +@@ -654,23 +654,28 @@ void CTCPServer::CWebSocketClient::Send(const char *data, unsigned int size) + void CTCPServer::CWebSocketClient::PushBuffer(CTCPServer *host, const char *buffer, int length) + { + bool send; +- const CWebSocketMessage *msg; +- if ((msg = m_websocket->Handle(buffer, length, send)) != NULL && msg->IsComplete()) ++ const CWebSocketMessage *msg = NULL; ++ size_t len = length; ++ do + { +- std::vector frames = msg->GetFrames(); +- if (send) +- { +- for (unsigned int index = 0; index < frames.size(); index++) +- Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength()); +- } +- else ++ if ((msg = m_websocket->Handle(buffer, len, send)) != NULL && msg->IsComplete()) + { +- for (unsigned int index = 0; index < frames.size(); index++) +- CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength()); +- } ++ std::vector frames = msg->GetFrames(); ++ if (send) ++ { ++ for (unsigned int index = 0; index < frames.size(); index++) ++ Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength()); ++ } ++ else ++ { ++ for (unsigned int index = 0; index < frames.size(); index++) ++ CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength()); ++ } + +- delete msg; ++ delete msg; ++ } + } ++ while (len > 0 && msg != NULL); + + if (m_websocket->GetState() == WebSocketStateClosed) + Disconnect(); +diff --git a/xbmc/network/websocket/WebSocket.cpp b/xbmc/network/websocket/WebSocket.cpp +index 94e7ab0..5008073 100644 +--- a/xbmc/network/websocket/WebSocket.cpp ++++ b/xbmc/network/websocket/WebSocket.cpp +@@ -80,11 +80,11 @@ + // Get the MASK flag + m_masked = ((m_data[1] & MASK_MASK) == MASK_MASK); + +- // Get the playload length ++ // Get the payload length + m_length = (uint64_t)(m_data[1] & MASK_LENGTH); +- if ((m_length <= 125 && length < m_length + LENGTH_MIN) || +- (m_length == 126 && length < LENGTH_MIN + 2) || +- (m_length == 127 && length < LENGTH_MIN + 8)) ++ if ((m_length <= 125 && m_lengthFrame < m_length + LENGTH_MIN) || ++ (m_length == 126 && m_lengthFrame < LENGTH_MIN + 2) || ++ (m_length == 127 && m_lengthFrame < LENGTH_MIN + 8)) + { + CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received"); + reset(); +@@ -110,7 +110,7 @@ + offset = 8; + } + +- if (length < LENGTH_MIN + offset + m_length) ++ if (m_lengthFrame < LENGTH_MIN + offset + m_length) + { + CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received"); + reset(); +@@ -124,12 +124,8 @@ + offset += 4; + } + +- if (length != LENGTH_MIN + offset + m_length) +- { +- CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received"); +- reset(); +- return; +- } ++ if (m_lengthFrame != LENGTH_MIN + offset + m_length) ++ m_lengthFrame = LENGTH_MIN + offset + m_length; + + // Get application data + if (m_length > 0) +@@ -305,102 +301,122 @@ void CWebSocketMessage::Clear() + m_frames.clear(); + } + +-const CWebSocketMessage* CWebSocket::Handle(const char *buffer, size_t length, bool &send) ++const CWebSocketMessage* CWebSocket::Handle(const char* &buffer, size_t &length, bool &send) + { + send = false; + +- switch (m_state) ++ while (length > 0) + { +- case WebSocketStateConnected: ++ switch (m_state) + { +- CWebSocketFrame *frame = GetFrame(buffer, length); +- if (!frame->IsValid()) ++ case WebSocketStateConnected: + { +- CLog::Log(LOGINFO, "WebSocket: Invalid frame received"); +- delete frame; +- return NULL; +- } +- +- if (frame->IsControlFrame()) +- { +- if (!frame->IsFinal()) ++ CWebSocketFrame *frame = GetFrame(buffer, length); ++ if (!frame->IsValid()) + { ++ CLog::Log(LOGINFO, "WebSocket: Invalid frame received"); + delete frame; + return NULL; + } + +- CWebSocketMessage *msg = NULL; +- switch (frame->GetOpcode()) ++ // adjust the length and the buffer values ++ length -= frame->GetFrameLength(); ++ buffer += frame->GetFrameLength(); ++ ++ if (frame->IsControlFrame()) + { +- case WebSocketPing: +- msg = GetMessage(); +- if (msg != NULL) +- msg->AddFrame(Pong(frame->GetApplicationData())); +- break; ++ if (!frame->IsFinal()) ++ { ++ delete frame; ++ return NULL; ++ } ++ ++ CWebSocketMessage *msg = NULL; ++ switch (frame->GetOpcode()) ++ { ++ case WebSocketPing: ++ msg = GetMessage(); ++ if (msg != NULL) ++ msg->AddFrame(Pong(frame->GetApplicationData())); ++ break; + +- case WebSocketConnectionClose: +- CLog::Log(LOGINFO, "WebSocket: connection closed by client"); +- +- msg = GetMessage(); +- if (msg != NULL) +- msg->AddFrame(Close()); +- +- m_state = WebSocketStateClosed; +- break; +- +- case WebSocketContinuationFrame: +- case WebSocketTextFrame: +- case WebSocketBinaryFrame: +- case WebSocketPong: +- case WebSocketUnknownFrame: +- default: +- break; ++ case WebSocketConnectionClose: ++ CLog::Log(LOGINFO, "WebSocket: connection closed by client"); ++ ++ msg = GetMessage(); ++ if (msg != NULL) ++ msg->AddFrame(Close()); ++ ++ m_state = WebSocketStateClosed; ++ break; ++ ++ case WebSocketContinuationFrame: ++ case WebSocketTextFrame: ++ case WebSocketBinaryFrame: ++ case WebSocketPong: ++ case WebSocketUnknownFrame: ++ default: ++ break; ++ } ++ ++ delete frame; ++ ++ if (msg != NULL) ++ send = true; ++ ++ return msg; + } + +- delete frame; ++ if (m_message == NULL && (m_message = GetMessage()) == NULL) ++ { ++ CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message"); ++ delete frame; ++ return NULL; ++ } + +- if (msg != NULL) +- send = true; ++ m_message->AddFrame(frame); ++ if (!m_message->IsComplete()) ++ { ++ if (length > 0) ++ continue; ++ else ++ return NULL; ++ } + ++ CWebSocketMessage *msg = m_message; ++ m_message = NULL; + return msg; + } + +- if (m_message == NULL && (m_message = GetMessage()) == NULL) ++ case WebSocketStateClosing: + { +- CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message"); +- delete frame; +- return NULL; +- } ++ CWebSocketFrame *frame = GetFrame(buffer, length); + +- m_message->AddFrame(frame); +- if (!m_message->IsComplete()) +- return NULL; ++ if (frame->IsValid()) ++ { ++ // adjust the length and the buffer values ++ length -= frame->GetFrameLength(); ++ buffer += frame->GetFrameLength(); ++ } + +- CWebSocketMessage *msg = m_message; +- m_message = NULL; +- return msg; +- } ++ if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose) ++ { ++ CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)"); ++ delete frame; ++ return NULL; ++ } + +- case WebSocketStateClosing: +- { +- CWebSocketFrame *frame = GetFrame(buffer, length); +- if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose) +- { +- CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)"); +- delete frame; ++ m_state = WebSocketStateClosed; + return NULL; + } + +- m_state = WebSocketStateClosed; +- return NULL; ++ case WebSocketStateNotConnected: ++ case WebSocketStateClosed: ++ case WebSocketStateHandshaking: ++ default: ++ CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state"); ++ return NULL; + } +- +- case WebSocketStateNotConnected: +- case WebSocketStateClosed: +- case WebSocketStateHandshaking: +- default: +- CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state"); +- return NULL; + } + + return NULL; +diff --git a/xbmc/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h +index bbfaa89..e0d3cae 100644 +--- a/xbmc/network/websocket/WebSocket.h ++++ b/xbmc/network/websocket/WebSocket.h +@@ -122,7 +122,7 @@ class CWebSocket + WebSocketState GetState() { return m_state; } + + virtual bool Handshake(const char* data, size_t length, std::string &response) = 0; +- virtual const CWebSocketMessage* Handle(const char *buffer, size_t length, bool &send); ++ virtual const CWebSocketMessage* Handle(const char* &buffer, size_t &length, bool &send); + virtual const CWebSocketMessage* Send(WebSocketFrameOpcode opcode, const char* data = NULL, uint32_t length = 0); + virtual const CWebSocketFrame* Ping(const char* data = NULL) const = 0; + virtual const CWebSocketFrame* Pong(const char* data = NULL) const = 0; +-- +1.7.10 +