From 92c4297d288a26b1b2a416e75fd70cb5eaa3eb15 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 18:13:35 +0200 Subject: [PATCH 1/5] linux: add DELL mceusb support (Device 0471:2093) Signed-off-by: Stephan Raue --- ...2.6.39-rc5-056_mceusb_add_DELL_receiver-0.1.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/linux/patches/linux-2.6.39-rc5-056_mceusb_add_DELL_receiver-0.1.patch diff --git a/packages/linux/patches/linux-2.6.39-rc5-056_mceusb_add_DELL_receiver-0.1.patch b/packages/linux/patches/linux-2.6.39-rc5-056_mceusb_add_DELL_receiver-0.1.patch new file mode 100644 index 0000000000..c632320aba --- /dev/null +++ b/packages/linux/patches/linux-2.6.39-rc5-056_mceusb_add_DELL_receiver-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur linux-2.6.39-rc5/drivers/media/rc/mceusb.c linux-2.6.39-rc5.patch/drivers/media/rc/mceusb.c +--- linux-2.6.39-rc5/drivers/media/rc/mceusb.c 2011-04-27 05:48:50.000000000 +0200 ++++ linux-2.6.39-rc5.patch/drivers/media/rc/mceusb.c 2011-04-29 18:10:32.361073307 +0200 +@@ -220,6 +220,8 @@ + { USB_DEVICE(VENDOR_PHILIPS, 0x206c) }, + /* Philips/Spinel plus IR transceiver for ASUS */ + { USB_DEVICE(VENDOR_PHILIPS, 0x2088) }, ++ /* Philips RC6 Transceiver, Dell branded */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x2093) }, + /* Realtek MCE IR Receiver and card reader */ + { USB_DEVICE(VENDOR_REALTEK, 0x0161), + .driver_info = MULTIFUNCTION }, From b9c8ef57f1012f00ff27c61b7523d07369464206 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 21:16:40 +0200 Subject: [PATCH 2/5] Revert "Imaging: convert to python egg package" This reverts commit 78e264c18ea50d95985138050f4dbd62d3dff1c6. --- packages/python/graphics/Imaging/build | 8 +++++++- packages/python/graphics/Imaging/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/graphics/Imaging/build b/packages/python/graphics/Imaging/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/graphics/Imaging/build +++ b/packages/python/graphics/Imaging/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/graphics/Imaging/install b/packages/python/graphics/Imaging/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/graphics/Imaging/install +++ b/packages/python/graphics/Imaging/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL From 511f793b01edf427017bce07cf50222c0ee1b865 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 22:26:21 +0200 Subject: [PATCH 3/5] projects/ION/linux: add e1000 and e1000e network driver Signed-off-by: Stephan Raue --- projects/ION/linux/linux.i386.conf | 7 +++---- projects/ION/linux/linux.x86_64.conf | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index a68d0bfb5c..8a709c3e4c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5 Kernel Configuration +# Linux/i386 2.6.39-rc5-git2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -979,8 +979,8 @@ CONFIG_FORCEDETH=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set +CONFIG_E1000=m +CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set @@ -2508,7 +2508,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 6c65fc82f2..b288c589d9 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc5 Kernel Configuration +# Linux/x86_64 2.6.39-rc5-git2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -928,8 +928,8 @@ CONFIG_FORCEDETH=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set +CONFIG_E1000=m +CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set @@ -2451,7 +2451,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y From e206629d59d14852e1b0089961f74e5e4cbac452 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 22:26:37 +0200 Subject: [PATCH 4/5] projects/Intel/linux: add e1000 network driver Signed-off-by: Stephan Raue --- projects/Intel/linux/linux.i386.conf | 5 ++--- projects/Intel/linux/linux.x86_64.conf | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 3c79db5f52..3226bf775e 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5 Kernel Configuration +# Linux/i386 2.6.39-rc5-git2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -943,7 +943,7 @@ CONFIG_MII=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -2505,7 +2505,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 0c9e780fee..f29e8f4941 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc5 Kernel Configuration +# Linux/x86_64 2.6.39-rc5-git2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -893,7 +893,7 @@ CONFIG_MII=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -2444,7 +2444,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y From 0c2bf51634b4d5c0f45ed8619911f31e7a661b95 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 22:27:11 +0200 Subject: [PATCH 5/5] projects/*/linux: update kernel config Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 6 +++--- projects/Generic/linux/linux.i386.conf | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index fe8d7cbbf4..a142ab850d 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5 Kernel Configuration +# Linux/i386 2.6.39-rc5-git2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1463,8 +1463,9 @@ CONFIG_SMS_USB_DRV=m # # Multistandard (satellite) frontends # -CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m # # DVB-S (satellite) frontends @@ -2270,7 +2271,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index a3863e8cd8..dbdb1a76c3 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5 Kernel Configuration +# Linux/i386 2.6.39-rc5-git2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2646,7 +2646,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y