From 97b55b181ecb4f240add21f61608857aff45c013 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 27 Feb 2011 20:31:16 +0100
Subject: [PATCH 01/19] xextproto: update to xextproto-7.2.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/proto/xextproto/meta | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/x11/proto/xextproto/meta b/packages/x11/proto/xextproto/meta
index 6d36da6695..46b5a95d1f 100644
--- a/packages/x11/proto/xextproto/meta
+++ b/packages/x11/proto/xextproto/meta
@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="xextproto"
-PKG_VERSION="20110223"
+PKG_VERSION="7.2.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
-#PKG_URL="http://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain util-macros"
 PKG_PRIORITY="optional"

From 83dbd9556b68bec420368f95db837f5d3fb69d12 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 27 Feb 2011 23:43:59 +0100
Subject: [PATCH 02/19] xf86-video-nvidia: install libnvidia-ml.so* too

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/driver/xf86-video-nvidia/install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index 964273efaa..215f3c252e 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -38,6 +38,7 @@ mkdir -p $INSTALL/etc/X11
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libnvidia-glcore.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libnvidia-ml.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/tls/libnvidia-tls.so* $INSTALL/usr/lib
 # rename to not conflicting with Mesa libGL.so
   cp -P $PKG_BUILD/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1

From c2c4fa8c4d16e137e836ad57dcf8510244bce4ee Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 27 Feb 2011 23:52:12 +0100
Subject: [PATCH 03/19] samba: add printers section in samba.conf to hide some
 ugly log messages, thanks to Milhouse

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/samba/config/smb.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
index e5a78e670e..a5784365bf 100644
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@@ -33,6 +33,16 @@
   syslog only = yes
   name resolve order = lmhosts wins bcast host
 
+[printers]
+  comment = All Printers
+  path = /var/spool/samba
+  browseable = no
+  guest ok = no
+  writable = no
+  printable = yes
+  printcap name = /dev/null
+  load printers = no
+
 # Using the following configurations as a template allows you to add
 # writable shares of disks and paths under /storage
 

From 7e1fd18d3755e4bdeebd0378dba81a3b052b08c0 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 28 Feb 2011 00:26:57 +0100
Subject: [PATCH 04/19] autoupdate: use /storage/.xbmc/temp as tempdir for
 downloading and extracting (fixes update problems on low memory devices like
 ATV1)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../tools/autoupdate/scripts/autoupdate.devel | 28 ++++++++++---------
 .../autoupdate/scripts/autoupdate.release     | 28 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel
index 6121a2e8a2..2e76ccbc35 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.devel
+++ b/packages/tools/autoupdate/scripts/autoupdate.devel
@@ -21,6 +21,7 @@
 ################################################################################
 
 OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+TMP_DIR="$HOME/.xbmc/temp"
 
 if [ -f /etc/update.conf ]; then
   . /etc/update.conf
@@ -42,10 +43,10 @@ fi
 download () {
   case "$DL_METHOD" in
           wget)
-            wget -c $1 -P /tmp
+            wget -c $1 -P $TMP_DIR
             ;;
           scp)
-            scp $SCP_ARG "$1" /tmp
+            scp $SCP_ARG "$1" $TMP_DIR
             ;;
         esac
 }
@@ -67,13 +68,13 @@ if [ ! -f /var/lock/update.lock ]; then
     THIS_VERSION="`cat /etc/version`"
 
   # get infofile with the latest released version
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
     download "$UPDATEURL/latest"
 
-    NEW_IMAGE="`cat /tmp/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
+    NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`"
 
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
 
   # compare installed version with latest released version
     THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
@@ -94,20 +95,21 @@ if [ ! -f /var/lock/update.lock ]; then
         touch /var/lock/update.lock
 
       # downloading the new version
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
 
       # extract the image
-        rm -rf /tmp/$NEW_IMAGE
-        tar -xjvf /tmp/$NEW_IMAGE.tar.bz2 -C /tmp
+        rm -rf $TMP_DIR/$NEW_IMAGE
+        tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
 
       # move KERNEL and SYSTEM to an temporary file
         mkdir -p /storage/.update
 
-        [ -f /tmp/$NEW_IMAGE/target/KERNEL ] && \
-          mv /tmp/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
+        [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
+          mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
 
-        [ -f /tmp/$NEW_IMAGE/target/SYSTEM ] && \
-          mv /tmp/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
+        [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
+          mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
         sync
 
       # move KERNEL and SYSTEM to the right place
@@ -115,8 +117,8 @@ if [ ! -f /var/lock/update.lock ]; then
         mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
 
       # cleanup tmp files
-        rm -rf /tmp/$NEW_IMAGE
-        rm -rf /tmp/$NEW_IMAGE.tar.bz2
+        rm -rf $TMP_DIR/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         rm -rf /storage/.update/*.tmp
 
       # we are ready (hopefully)
diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release
index 309ce8968a..e16401805e 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.release
+++ b/packages/tools/autoupdate/scripts/autoupdate.release
@@ -21,6 +21,7 @@
 ################################################################################
 
 OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+TMP_DIR="$HOME/.xbmc/temp"
 
 if [ -f /etc/update.conf ]; then
   . /etc/update.conf
@@ -42,10 +43,10 @@ fi
 download () {
   case "$DL_METHOD" in
           wget)
-            wget -c $1 -P /tmp
+            wget -c $1 -P $TMP_DIR
             ;;
           scp)
-            scp $SCP_ARG "$1" /tmp
+            scp $SCP_ARG "$1" $TMP_DIR
             ;;
         esac
 }
@@ -70,13 +71,13 @@ if [ ! -f /var/lock/update.lock ]; then
     THIS_PATCH="`echo "$THIS_VERSION" | cut -d "." -f3`"
 
   # get infofile with the latest released version
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
     download "$UPDATEURL/latest"
 
-    NEW_IMAGE="`cat /tmp/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
+    NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`"
 
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
 
   # compare installed version with latest released version
     NEW_MAJOR="`echo "$NEW_VERSION" | cut -d "." -f1`"
@@ -101,20 +102,21 @@ if [ ! -f /var/lock/update.lock ]; then
         touch /var/lock/update.lock
 
       # downloading the new version
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
 
       # extract the image
-        rm -rf /tmp/$NEW_IMAGE
-        tar -xjvf /tmp/$NEW_IMAGE.tar.bz2 -C /tmp
+        rm -rf $TMP_DIR/$NEW_IMAGE
+        tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
 
       # move KERNEL and SYSTEM to an temporary file
         mkdir -p /storage/.update
 
-        [ -f /tmp/$NEW_IMAGE/target/KERNEL ] && \
-          mv /tmp/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
+        [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
+          mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
 
-        [ -f /tmp/$NEW_IMAGE/target/SYSTEM ] && \
-          mv /tmp/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
+        [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
+          mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
         sync
 
       # move KERNEL and SYSTEM to the right place
@@ -122,8 +124,8 @@ if [ ! -f /var/lock/update.lock ]; then
         mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
 
       # cleanup tmp files
-        rm -rf /tmp/$NEW_IMAGE
-        rm -rf /tmp/$NEW_IMAGE.tar.bz2
+        rm -rf $TMP_DIR/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         rm -rf /storage/.update/*.tmp
 
       # we are ready (hopefully)

From 4950cfdc7af6d50547be282b7b80fc1ada24406d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 28 Feb 2011 15:52:19 +0100
Subject: [PATCH 05/19] xf86-video-nvidia: add a proper symlink so nvidia-smi
 is now running

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/driver/xf86-video-nvidia/build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/x11/driver/xf86-video-nvidia/build b/packages/x11/driver/xf86-video-nvidia/build
index 3d22fd6140..de39116c2d 100755
--- a/packages/x11/driver/xf86-video-nvidia/build
+++ b/packages/x11/driver/xf86-video-nvidia/build
@@ -24,3 +24,7 @@
 
 cd $PKG_BUILD/kernel
   make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
+
+cd ..
+# linking libnvidia-ml.so.$PKG_VERSION to libnvidia-ml.so.1
+  ln -sf libnvidia-ml.so.$PKG_VERSION libnvidia-ml.so.1
\ No newline at end of file

From 859a84f5b82f556c974e24e51e8d92765e866a0b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 28 Feb 2011 15:53:55 +0100
Subject: [PATCH 06/19] xbmc: change detection of GPU temperature because of a
 format change in output of nvidia-smi, thanks to gilphilbert and xe`

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/scripts/gputemp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mediacenter/xbmc/scripts/gputemp b/packages/mediacenter/xbmc/scripts/gputemp
index accc4f023a..3c39bc5f73 100755
--- a/packages/mediacenter/xbmc/scripts/gputemp
+++ b/packages/mediacenter/xbmc/scripts/gputemp
@@ -23,7 +23,7 @@
 TEMP="0"
 
 if lspci -n | grep 0300 | grep -q 10de; then
-  [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -a | grep 'Temperature' | awk '{print $3}'`
+  [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,<gpu_temp>,,g'`
 fi
 
 echo "${TEMP} C"

From 20faf6a8fbe1f467cb8557c6025a0d7f1f4a74d5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 28 Feb 2011 15:56:50 +0100
Subject: [PATCH 07/19] linux: add patch to fix wakeup from standby if using
 the nuvoton driver, thanks to demod

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch

diff --git a/packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch b/packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch
new file mode 100644
index 0000000000..32e2eb545f
--- /dev/null
+++ b/packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch
@@ -0,0 +1,12 @@
+diff -Naur linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h
+--- linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h	2011-02-22 02:25:52.000000000 +0100
++++ linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h	2011-02-28 14:26:20.385871213 +0100
+@@ -306,7 +306,7 @@
+ #define CIR_WAKE_IRFIFOSTS_RX_FULL	0x10
+ 
+ /* CIR Wake FIFO buffer is 67 bytes long */
+-#define CIR_WAKE_FIFO_LEN		67
++#define CIR_WAKE_FIFO_LEN		65
+ /* CIR Wake byte comparison tolerance */
+ #define CIR_WAKE_CMP_TOLERANCE		5
+ 

From 248c68af4ed5062c36e3aff8fb58dd963538e00b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 28 Feb 2011 20:06:34 +0100
Subject: [PATCH 08/19] connman: update to connman-3634185

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/meta | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index 527926b9e9..b4961b6136 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0.70"
+PKG_VERSION="3634185"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
 PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
 PKG_PRIORITY="optional"

From 8e873064bc24976857122bfca6146aa0dec8ce9c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 1 Mar 2011 04:24:22 +0100
Subject: [PATCH 09/19] xbmc: add boxee remote support hack, thanks to elum

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/init.d/93_xbmc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index aeb0a615c8..c0683e89a8 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -28,6 +28,11 @@ XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
 
 progress "starting XBMC"
 
+# hack for Boxee Remote
+if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
+  export SDL_MOUSE_RELATIVE=0
+fi
+
 # starting autoupdate
   [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
 

From f096a98756c1edbd21961a700461d7f43711765a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:37:04 +0100
Subject: [PATCH 10/19] linuxtv-dvb-firmware: remove package
 'linuxtv-dvb-firmware'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../linuxtv-dvb-firmware/install              | 26 --------------
 .../linux-firmware/linuxtv-dvb-firmware/meta  | 36 -------------------
 2 files changed, 62 deletions(-)
 delete mode 100755 packages/linux-firmware/linuxtv-dvb-firmware/install
 delete mode 100644 packages/linux-firmware/linuxtv-dvb-firmware/meta

diff --git a/packages/linux-firmware/linuxtv-dvb-firmware/install b/packages/linux-firmware/linuxtv-dvb-firmware/install
deleted file mode 100755
index 1643ed9bf9..0000000000
--- a/packages/linux-firmware/linuxtv-dvb-firmware/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware
-  cp -PR $PKG_BUILD/*.fw* $INSTALL/lib/firmware
diff --git a/packages/linux-firmware/linuxtv-dvb-firmware/meta b/packages/linux-firmware/linuxtv-dvb-firmware/meta
deleted file mode 100644
index 5e0187c73b..0000000000
--- a/packages/linux-firmware/linuxtv-dvb-firmware/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="linuxtv-dvb-firmware"
-PKG_VERSION="20110212"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.linuxtv.org"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="linuxtv-dvb-firmware: firmwarefiles for various DVB Cards."
-PKG_LONGDESC="firmwarefiles for various DVB Cards."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

From a63e18dee69d3038bf3ec9b2e2da201cc62ea902 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:37:27 +0100
Subject: [PATCH 11/19] zd1211-firmware: remove package 'zd1211-firmware'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../linux-firmware/zd1211-firmware/install    | 26 --------------
 packages/linux-firmware/zd1211-firmware/meta  | 36 -------------------
 2 files changed, 62 deletions(-)
 delete mode 100755 packages/linux-firmware/zd1211-firmware/install
 delete mode 100644 packages/linux-firmware/zd1211-firmware/meta

diff --git a/packages/linux-firmware/zd1211-firmware/install b/packages/linux-firmware/zd1211-firmware/install
deleted file mode 100755
index 7ac8358f70..0000000000
--- a/packages/linux-firmware/zd1211-firmware/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware/zd1211
-  cp -P $BUILD/$PKG_NAME/zd1211* $INSTALL/lib/firmware/zd1211
diff --git a/packages/linux-firmware/zd1211-firmware/meta b/packages/linux-firmware/zd1211-firmware/meta
deleted file mode 100644
index d7a3622723..0000000000
--- a/packages/linux-firmware/zd1211-firmware/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="zd1211-firmware"
-PKG_VERSION="1.4"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://sourceforge.net/projects/zd1211/"
-PKG_URL="$SOURCEFORGE_SRC/zd1211/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_LONGDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

From 05cdc9a3c1c1c42cf5039b109e91a77408bcf8cf Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:37:46 +0100
Subject: [PATCH 12/19] ipw2200-fw: remove package 'ipw2200-fw'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/ipw2200-fw/install | 26 ----------------
 packages/linux-firmware/ipw2200-fw/meta    | 36 ----------------------
 2 files changed, 62 deletions(-)
 delete mode 100755 packages/linux-firmware/ipw2200-fw/install
 delete mode 100644 packages/linux-firmware/ipw2200-fw/meta

diff --git a/packages/linux-firmware/ipw2200-fw/install b/packages/linux-firmware/ipw2200-fw/install
deleted file mode 100755
index 9898ca8275..0000000000
--- a/packages/linux-firmware/ipw2200-fw/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware
-  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/linux-firmware/ipw2200-fw/meta b/packages/linux-firmware/ipw2200-fw/meta
deleted file mode 100644
index eb24095786..0000000000
--- a/packages/linux-firmware/ipw2200-fw/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ipw2200-fw"
-PKG_VERSION="3.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://ipw2200.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="ipw2200-fw: Intel PRO/Wireless 2200 Driver for Linux"
-PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2200 Network Connection mini PCI adapter. This project (IPW2200) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

From bf19953eba37e720071181238904571fe0f6acf1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:38:08 +0100
Subject: [PATCH 13/19] ipw2100-fw: remove package 'ipw2100-fw'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/ipw2100-fw/install | 26 ----------------
 packages/linux-firmware/ipw2100-fw/meta    | 36 ----------------------
 2 files changed, 62 deletions(-)
 delete mode 100755 packages/linux-firmware/ipw2100-fw/install
 delete mode 100644 packages/linux-firmware/ipw2100-fw/meta

diff --git a/packages/linux-firmware/ipw2100-fw/install b/packages/linux-firmware/ipw2100-fw/install
deleted file mode 100755
index 21fe380f8a..0000000000
--- a/packages/linux-firmware/ipw2100-fw/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware
-  cp -P $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/linux-firmware/ipw2100-fw/meta b/packages/linux-firmware/ipw2100-fw/meta
deleted file mode 100644
index b09408acce..0000000000
--- a/packages/linux-firmware/ipw2100-fw/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ipw2100-fw"
-PKG_VERSION="1.3"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://ipw2100.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="ipw2100-fw: Intel PRO/Wireless 2100 Driver for Linux"
-PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2100 Network Connection mini PCI adapter. This project (IPW2100) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

From c5159936418dcbd8933bb81485ec43904e664ce7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:38:24 +0100
Subject: [PATCH 14/19] b43-fw: remove package 'b43-fw'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/b43-fw/install | 26 -------------------
 packages/linux-firmware/b43-fw/meta    | 36 --------------------------
 2 files changed, 62 deletions(-)
 delete mode 100755 packages/linux-firmware/b43-fw/install
 delete mode 100644 packages/linux-firmware/b43-fw/meta

diff --git a/packages/linux-firmware/b43-fw/install b/packages/linux-firmware/b43-fw/install
deleted file mode 100755
index c67120119c..0000000000
--- a/packages/linux-firmware/b43-fw/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware/b43
-  cp -P $PKG_BUILD/* $INSTALL/lib/firmware/b43
diff --git a/packages/linux-firmware/b43-fw/meta b/packages/linux-firmware/b43-fw/meta
deleted file mode 100644
index f1003ef6fa..0000000000
--- a/packages/linux-firmware/b43-fw/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="b43-fw"
-PKG_VERSION="20110211"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.broadcom.com"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="b43-fw: Broadcom B43 Firmware"
-PKG_LONGDESC="b43-fw: Broadcom B43 Firmware"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

From 30ffc7b1fa18c95d797b79bbea8fb627ceb9ea95 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:39:24 +0100
Subject: [PATCH 15/19] new package: add package 'dvb-firmware'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/dvb-firmware/build   | 27 +++++++++++++++
 packages/linux-firmware/dvb-firmware/install | 26 ++++++++++++++
 packages/linux-firmware/dvb-firmware/meta    | 36 ++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100755 packages/linux-firmware/dvb-firmware/build
 create mode 100755 packages/linux-firmware/dvb-firmware/install
 create mode 100644 packages/linux-firmware/dvb-firmware/meta

diff --git a/packages/linux-firmware/dvb-firmware/build b/packages/linux-firmware/dvb-firmware/build
new file mode 100755
index 0000000000..16f37ff021
--- /dev/null
+++ b/packages/linux-firmware/dvb-firmware/build
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+DESTDIR=.install ./install
\ No newline at end of file
diff --git a/packages/linux-firmware/dvb-firmware/install b/packages/linux-firmware/dvb-firmware/install
new file mode 100755
index 0000000000..e15be287d7
--- /dev/null
+++ b/packages/linux-firmware/dvb-firmware/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta
new file mode 100644
index 0000000000..3a3b173480
--- /dev/null
+++ b/packages/linux-firmware/dvb-firmware/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="dvb-firmware"
+PKG_VERSION="0.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Free-to-use"
+PKG_SITE="https://github.com/OpenELEC/dvb-firmware"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="dvb-firmware: firmwares for various DVB drivers"
+PKG_LONGDESC="dvb-firmware: firmwares for various DVB drivers"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

From 14ebb58d158db5d6b8cd56db76464cc4c43807b5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:39:37 +0100
Subject: [PATCH 16/19] new package: add package 'wlan-firmware'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/wlan-firmware/build   | 27 ++++++++++++++
 packages/linux-firmware/wlan-firmware/install | 26 ++++++++++++++
 packages/linux-firmware/wlan-firmware/meta    | 36 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100755 packages/linux-firmware/wlan-firmware/build
 create mode 100755 packages/linux-firmware/wlan-firmware/install
 create mode 100644 packages/linux-firmware/wlan-firmware/meta

diff --git a/packages/linux-firmware/wlan-firmware/build b/packages/linux-firmware/wlan-firmware/build
new file mode 100755
index 0000000000..16f37ff021
--- /dev/null
+++ b/packages/linux-firmware/wlan-firmware/build
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+DESTDIR=.install ./install
\ No newline at end of file
diff --git a/packages/linux-firmware/wlan-firmware/install b/packages/linux-firmware/wlan-firmware/install
new file mode 100755
index 0000000000..e15be287d7
--- /dev/null
+++ b/packages/linux-firmware/wlan-firmware/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta
new file mode 100644
index 0000000000..55d96a0dd3
--- /dev/null
+++ b/packages/linux-firmware/wlan-firmware/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="wlan-firmware"
+PKG_VERSION="0.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Free-to-use"
+PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="wlan-firmware: firmwares for various WLAN drivers"
+PKG_LONGDESC="wlan-firmware: firmwares for various WLAN drivers"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

From 123136a069384d6008b5cc87f4d5b8c635aca31d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:41:23 +0100
Subject: [PATCH 17/19] linux-firmware: rework firmware packages, we have our
 now our own firmware repos at https://github.com/OpenELEC/dvb-firmware and
 https://github.com/OpenELEC/wlan-firmware, this saves us much space again :-)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/install | 38 ---------------------------------
 packages/linux-firmware/meta    | 16 +++++++-------
 packages/linux/install          | 10 ++++-----
 projects/ATV/options            |  9 +++-----
 projects/Generic/options        |  9 +++-----
 projects/ION/options            |  9 +++-----
 projects/Intel/options          |  9 +++-----
 7 files changed, 24 insertions(+), 76 deletions(-)
 delete mode 100755 packages/linux-firmware/install

diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install
deleted file mode 100755
index a54b7725c8..0000000000
--- a/packages/linux-firmware/install
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options
-
-if [ "$FIRMWARE" = "external" ]; then
-  mkdir -p $INSTALL/lib/firmware
-    cp -R $PKG_BUILD/* $INSTALL/lib/firmware
-fi
-
-for firmware in $ADDITIONAL_FIRMWARE; do
-  [ $firmware = b43 ] && $SCRIPTS/install b43-fw
-  [ $firmware = ipw2100 ] && $SCRIPTS/install ipw2100-fw
-  [ $firmware = ipw2200 ] && $SCRIPTS/install ipw2200-fw
-  [ $firmware = zd1211 ] && $SCRIPTS/install zd1211-firmware
-  [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware
-done
-
-exit 0
diff --git a/packages/linux-firmware/meta b/packages/linux-firmware/meta
index 8043b8e851..fc2d2d1a45 100644
--- a/packages/linux-firmware/meta
+++ b/packages/linux-firmware/meta
@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linux-firmware"
-PKG_VERSION="20110222"
+PKG_NAME="firmware"
+PKG_VERSION=""
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS="$FIRMWARE"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="linux-firmware: various free firmware drivers"
-PKG_LONGDESC="linux-firmware is a package to install various free firmware drivers"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="firmware: various free firmware drivers"
+PKG_LONGDESC="firmware is a meta-package to install various free firmware drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
diff --git a/packages/linux/install b/packages/linux/install
index 1934f31b17..052eec44cd 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -37,12 +37,10 @@ for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v mo
   rm -f $i
 done
 
-if [ "$FIRMWARE" = "internal" ]; then
-  # copy kernel firmwares (if present and requested)
-    mkdir -p $INSTALL/lib/firmware
-      [ -d $PKG_BUILD/modules/lib/firmware ] && \
-        cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
-fi
+# copy kernel firmwares (if present and requested)
+  mkdir -p $INSTALL/lib/firmware
+  [ -d $PKG_BUILD/modules/lib/firmware ] && \
+    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
diff --git a/projects/ATV/options b/projects/ATV/options
index 69a2bd10d4..68f3d52129 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="none"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index 7913fc81c3..b09d15d9e3 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 7ded94a380..97ed1da186 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index ddcd85159f..d5071596ee 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="b43 dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

From 097c95cd0cc3bdc4d4e8bd01cf1a155822e54790 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 03:54:32 +0100
Subject: [PATCH 18/19] xbmc-addon-settings: add german language file, thanks
 to sCAPe and birds

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../resources/language/German/strings.xml     | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml

diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
new file mode 100644
index 0000000000..df4dd6ead1
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+<!-- System -->
+<string id="2000">System</string>
+<string id="2010">Tastatur</string>
+<string id="2011">Tastaturlayout</string>
+<string id="2020">System Aktualisierung</string>
+<string id="2021">Automatische Aktualisierung</string>
+<string id="2050">LCD/VFD</string>
+<string id="2051">LCD Treiber</string>
+<string id="2060">Beim Aufwachen</string>
+<string id="2061">Video-Datenbank automatisch aktualisieren</string>
+<string id="2062">Musik-Datenbank automatisch aktualisieren</string>
+
+<!-- Network -->
+<string id="2100">Netzwerk</string>
+<string id="2110">Allgemein</string>
+<string id="2111">Gerätename</string>
+<string id="2120">Netzwerk Adapter</string>
+<string id="2121">Netzwerk Technologie</string>
+<string id="2122">Netzwerk Gerät</string>
+<string id="2130">IP Einstellungen</string>
+<string id="2131">Statische IP Adresse</string>
+<string id="2132">Netzmaske Präfixlänge</string>
+<string id="2133">Netzwerk Gateway</string>
+<string id="2134">DNS Server 1</string>
+<string id="2135">DNS Server 2</string>
+<string id="2136">DNS Server 3</string>
+<string id="2150">WLAN Einstellungen</string>
+<string id="2151">WLAN SSID</string>
+<string id="2152">Verstecktes Netzwerk</string>
+<string id="2153">WLAN Sicherheit</string>
+<string id="2154">WLAN Passwort</string>
+
+<!-- TV_SERVER -->
+<string id="4100">TV/PVR</string>
+<string id="4110">TV Server</string>
+<string id="4111">Starte TV Server beim Booten</string>
+
+<!-- SAMBA -->
+<string id="5000">Samba</string>
+<string id="5010">Samba Server</string>
+<string id="5011">Starte Samba beim Booten</string>
+
+<!-- Transmission -->
+<string id="5100">Transmission</string>
+<string id="5110">Transmission Bittorrent</string>
+<string id="5111">Starte Transmission beim Booten</string>
+<string id="5120">Benutzer Einstellungen</string>
+<string id="5121">Authentifizierung verwenden</string>
+<string id="5122">Benutzername</string>
+<string id="5123">Passwort</string>
+<string id="5130">Netzwerk Einstellungen</string>
+<string id="5131">Erlaubte IP Adressen (durch Komma getrennt)</string>
+
+<!-- SABnzbd -->
+<string id="5200">SABnzbd</string>
+<string id="5210">SABnzbd Newsgroup Downloader</string>
+<string id="5211">Starte SABnzbd beim Booten</string>
+
+</strings>

From cea834629e6c61f1dc1f255803de53f9f591a562 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 2 Mar 2011 04:31:19 +0100
Subject: [PATCH 19/19] linux: update to linux-2.6.38-rc7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux/meta                                             | 2 +-
 ...osscompile.patch => linux-2.6.38-rc7-000_crosscompile.patch} | 0
 ...ature.patch => linux-2.6.38-rc7-002_bash_only_feature.patch} | 0
 ..._console.patch => linux-2.6.38-rc7-003-no_dev_console.patch} | 0
 ... => linux-2.6.38-rc7-004_lower_undefined_mode_timeout.patch} | 0
 ...mp.patch => linux-2.6.38-rc7-005_kconfig_no_timestamp.patch} | 0
 ...enable_utf8.patch => linux-2.6.38-rc7-006_enable_utf8.patch} | 0
 ...oppy_die.patch => linux-2.6.38-rc7-007_die_floppy_die.patch} | 0
 ...linux-2.6.38-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch} | 0
 ...linux-2.6.38-rc7-009_disable_i8042_check_on_apple_mac.patch} | 0
 ....patch => linux-2.6.38-rc7-050_add_appleir_usb_driver.patch} | 0
 ....patch => linux-2.6.38-rc7-051_add_ite-cir_driver-0.1.patch} | 0
 ...patch => linux-2.6.38-rc7-052-aureal_remote_quirk-0.1.patch} | 0
 ...-2.6.38-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch} | 0
 ....patch => linux-2.6.38-rc7-054_fix_nuvoton_wakeup-0.1.patch} | 0
 ...x-2.6.38-rc7-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch} | 0
 ...=> linux-2.6.38-rc7-110-drm_nouveau_upstream-20110222.patch} | 0
 ...patches.txt => linux-2.6.38-rc7-700_701-730_BFS_patches.txt} | 0
 ...sabled => linux-2.6.38-rc7-701_sched-bfs-363.patch.disabled} | 0
 ...ux-2.6.38-rc7-702_2637-bfs363-nonhotplug_fix.patch.disabled} | 0
 ...ck2-version.patch => linux-2.6.38-rc7-702_ck2-version.patch} | 0
 ...eaks.patch => linux-2.6.38-rc7-703_cpufreq-bfs_tweaks.patch} | 0
 ...lt_1000.patch => linux-2.6.38-rc7-704_hz-default_1000.patch} | 0
 ...t_250.patch => linux-2.6.38-rc7-705_hz-no_default_250.patch} | 0
 ...-raise_max.patch => linux-2.6.38-rc7-706_hz-raise_max.patch} | 0
 ...2.6.38-rc7-707_kconfig-expose_vmsplit_option.patch.disabled} | 0
 ...inux-2.6.38-rc7-708_mm-kswapd_inherit_prio-1.patch.disabled} | 0
 ... linux-2.6.38-rc7-709_mm-decrease_default_dirty_ratio.patch} | 0
 ... linux-2.6.38-rc7-710_mm-drop_swap_cache_aggressively.patch} | 0
 ....6.38-rc7-711_mm-enable_swaptoken_only_when_swap_full.patch} | 0
 ...d => linux-2.6.38-rc7-712_mm-background_scan.patch.disabled} | 0
 ...d => linux-2.6.38-rc7-713_mm-idleprio_prio-1.patch.disabled} | 0
 ...nux-2.6.38-rc7-714_mm-lru_cache_add_lru_tail.patch.disabled} | 0
 ...ness.patch => linux-2.6.38-rc7-716_mm-zero_swappiness.patch} | 0
 ...ne.patch => linux-2.6.38-rc7-717_preempt-desktop-tune.patch} | 0
 ...718_sched-add-above-background-load-function.patch.disabled} | 0
 36 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/linux/patches/{linux-2.6.38-rc6-000_crosscompile.patch => linux-2.6.38-rc7-000_crosscompile.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-002_bash_only_feature.patch => linux-2.6.38-rc7-002_bash_only_feature.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-003-no_dev_console.patch => linux-2.6.38-rc7-003-no_dev_console.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-004_lower_undefined_mode_timeout.patch => linux-2.6.38-rc7-004_lower_undefined_mode_timeout.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-005_kconfig_no_timestamp.patch => linux-2.6.38-rc7-005_kconfig_no_timestamp.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-006_enable_utf8.patch => linux-2.6.38-rc7-006_enable_utf8.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-007_die_floppy_die.patch => linux-2.6.38-rc7-007_die_floppy_die.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch => linux-2.6.38-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-009_disable_i8042_check_on_apple_mac.patch => linux-2.6.38-rc7-009_disable_i8042_check_on_apple_mac.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-050_add_appleir_usb_driver.patch => linux-2.6.38-rc7-050_add_appleir_usb_driver.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-051_add_ite-cir_driver-0.1.patch => linux-2.6.38-rc7-051_add_ite-cir_driver-0.1.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-052-aureal_remote_quirk-0.1.patch => linux-2.6.38-rc7-052-aureal_remote_quirk-0.1.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch => linux-2.6.38-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch => linux-2.6.38-rc7-054_fix_nuvoton_wakeup-0.1.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch => linux-2.6.38-rc7-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-110-drm_nouveau_upstream-20110222.patch => linux-2.6.38-rc7-110-drm_nouveau_upstream-20110222.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-700_701-730_BFS_patches.txt => linux-2.6.38-rc7-700_701-730_BFS_patches.txt} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-701_sched-bfs-363.patch.disabled => linux-2.6.38-rc7-701_sched-bfs-363.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-702_2637-bfs363-nonhotplug_fix.patch.disabled => linux-2.6.38-rc7-702_2637-bfs363-nonhotplug_fix.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-702_ck2-version.patch => linux-2.6.38-rc7-702_ck2-version.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-703_cpufreq-bfs_tweaks.patch => linux-2.6.38-rc7-703_cpufreq-bfs_tweaks.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-704_hz-default_1000.patch => linux-2.6.38-rc7-704_hz-default_1000.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-705_hz-no_default_250.patch => linux-2.6.38-rc7-705_hz-no_default_250.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-706_hz-raise_max.patch => linux-2.6.38-rc7-706_hz-raise_max.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-707_kconfig-expose_vmsplit_option.patch.disabled => linux-2.6.38-rc7-707_kconfig-expose_vmsplit_option.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-708_mm-kswapd_inherit_prio-1.patch.disabled => linux-2.6.38-rc7-708_mm-kswapd_inherit_prio-1.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-709_mm-decrease_default_dirty_ratio.patch => linux-2.6.38-rc7-709_mm-decrease_default_dirty_ratio.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-710_mm-drop_swap_cache_aggressively.patch => linux-2.6.38-rc7-710_mm-drop_swap_cache_aggressively.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-711_mm-enable_swaptoken_only_when_swap_full.patch => linux-2.6.38-rc7-711_mm-enable_swaptoken_only_when_swap_full.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-712_mm-background_scan.patch.disabled => linux-2.6.38-rc7-712_mm-background_scan.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-713_mm-idleprio_prio-1.patch.disabled => linux-2.6.38-rc7-713_mm-idleprio_prio-1.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-714_mm-lru_cache_add_lru_tail.patch.disabled => linux-2.6.38-rc7-714_mm-lru_cache_add_lru_tail.patch.disabled} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-716_mm-zero_swappiness.patch => linux-2.6.38-rc7-716_mm-zero_swappiness.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-717_preempt-desktop-tune.patch => linux-2.6.38-rc7-717_preempt-desktop-tune.patch} (100%)
 rename packages/linux/patches/{linux-2.6.38-rc6-718_sched-add-above-background-load-function.patch.disabled => linux-2.6.38-rc7-718_sched-add-above-background-load-function.patch.disabled} (100%)

diff --git a/packages/linux/meta b/packages/linux/meta
index bebc6e04d5..d2dcca2f1b 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.38-rc6"
+PKG_VERSION="2.6.38-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/linux/patches/linux-2.6.38-rc6-000_crosscompile.patch b/packages/linux/patches/linux-2.6.38-rc7-000_crosscompile.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-000_crosscompile.patch
rename to packages/linux/patches/linux-2.6.38-rc7-000_crosscompile.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.38-rc7-002_bash_only_feature.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-002_bash_only_feature.patch
rename to packages/linux/patches/linux-2.6.38-rc7-002_bash_only_feature.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.38-rc7-003-no_dev_console.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-003-no_dev_console.patch
rename to packages/linux/patches/linux-2.6.38-rc7-003-no_dev_console.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.38-rc7-004_lower_undefined_mode_timeout.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-004_lower_undefined_mode_timeout.patch
rename to packages/linux/patches/linux-2.6.38-rc7-004_lower_undefined_mode_timeout.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.38-rc7-005_kconfig_no_timestamp.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-005_kconfig_no_timestamp.patch
rename to packages/linux/patches/linux-2.6.38-rc7-005_kconfig_no_timestamp.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.38-rc7-006_enable_utf8.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-006_enable_utf8.patch
rename to packages/linux/patches/linux-2.6.38-rc7-006_enable_utf8.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.38-rc7-007_die_floppy_die.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-007_die_floppy_die.patch
rename to packages/linux/patches/linux-2.6.38-rc7-007_die_floppy_die.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.38-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch
rename to packages/linux/patches/linux-2.6.38-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.38-rc7-009_disable_i8042_check_on_apple_mac.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-009_disable_i8042_check_on_apple_mac.patch
rename to packages/linux/patches/linux-2.6.38-rc7-009_disable_i8042_check_on_apple_mac.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.38-rc7-050_add_appleir_usb_driver.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-050_add_appleir_usb_driver.patch
rename to packages/linux/patches/linux-2.6.38-rc7-050_add_appleir_usb_driver.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-051_add_ite-cir_driver-0.1.patch b/packages/linux/patches/linux-2.6.38-rc7-051_add_ite-cir_driver-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-051_add_ite-cir_driver-0.1.patch
rename to packages/linux/patches/linux-2.6.38-rc7-051_add_ite-cir_driver-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.38-rc7-052-aureal_remote_quirk-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-052-aureal_remote_quirk-0.1.patch
rename to packages/linux/patches/linux-2.6.38-rc7-052-aureal_remote_quirk-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-2.6.38-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch
rename to packages/linux/patches/linux-2.6.38-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch b/packages/linux/patches/linux-2.6.38-rc7-054_fix_nuvoton_wakeup-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-054_fix_nuvoton_wakeup-0.1.patch
rename to packages/linux/patches/linux-2.6.38-rc7-054_fix_nuvoton_wakeup-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch b/packages/linux/patches/linux-2.6.38-rc7-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
rename to packages/linux/patches/linux-2.6.38-rc7-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-110-drm_nouveau_upstream-20110222.patch b/packages/linux/patches/linux-2.6.38-rc7-110-drm_nouveau_upstream-20110222.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-110-drm_nouveau_upstream-20110222.patch
rename to packages/linux/patches/linux-2.6.38-rc7-110-drm_nouveau_upstream-20110222.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-700_701-730_BFS_patches.txt b/packages/linux/patches/linux-2.6.38-rc7-700_701-730_BFS_patches.txt
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-700_701-730_BFS_patches.txt
rename to packages/linux/patches/linux-2.6.38-rc7-700_701-730_BFS_patches.txt
diff --git a/packages/linux/patches/linux-2.6.38-rc6-701_sched-bfs-363.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-701_sched-bfs-363.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-701_sched-bfs-363.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-701_sched-bfs-363.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-702_2637-bfs363-nonhotplug_fix.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-702_2637-bfs363-nonhotplug_fix.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-702_2637-bfs363-nonhotplug_fix.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-702_2637-bfs363-nonhotplug_fix.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-702_ck2-version.patch b/packages/linux/patches/linux-2.6.38-rc7-702_ck2-version.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-702_ck2-version.patch
rename to packages/linux/patches/linux-2.6.38-rc7-702_ck2-version.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-703_cpufreq-bfs_tweaks.patch b/packages/linux/patches/linux-2.6.38-rc7-703_cpufreq-bfs_tweaks.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-703_cpufreq-bfs_tweaks.patch
rename to packages/linux/patches/linux-2.6.38-rc7-703_cpufreq-bfs_tweaks.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-704_hz-default_1000.patch b/packages/linux/patches/linux-2.6.38-rc7-704_hz-default_1000.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-704_hz-default_1000.patch
rename to packages/linux/patches/linux-2.6.38-rc7-704_hz-default_1000.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-705_hz-no_default_250.patch b/packages/linux/patches/linux-2.6.38-rc7-705_hz-no_default_250.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-705_hz-no_default_250.patch
rename to packages/linux/patches/linux-2.6.38-rc7-705_hz-no_default_250.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-706_hz-raise_max.patch b/packages/linux/patches/linux-2.6.38-rc7-706_hz-raise_max.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-706_hz-raise_max.patch
rename to packages/linux/patches/linux-2.6.38-rc7-706_hz-raise_max.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-707_kconfig-expose_vmsplit_option.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-707_kconfig-expose_vmsplit_option.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-707_kconfig-expose_vmsplit_option.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-707_kconfig-expose_vmsplit_option.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-708_mm-kswapd_inherit_prio-1.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-708_mm-kswapd_inherit_prio-1.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-708_mm-kswapd_inherit_prio-1.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-708_mm-kswapd_inherit_prio-1.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-709_mm-decrease_default_dirty_ratio.patch b/packages/linux/patches/linux-2.6.38-rc7-709_mm-decrease_default_dirty_ratio.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-709_mm-decrease_default_dirty_ratio.patch
rename to packages/linux/patches/linux-2.6.38-rc7-709_mm-decrease_default_dirty_ratio.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-710_mm-drop_swap_cache_aggressively.patch b/packages/linux/patches/linux-2.6.38-rc7-710_mm-drop_swap_cache_aggressively.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-710_mm-drop_swap_cache_aggressively.patch
rename to packages/linux/patches/linux-2.6.38-rc7-710_mm-drop_swap_cache_aggressively.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-711_mm-enable_swaptoken_only_when_swap_full.patch b/packages/linux/patches/linux-2.6.38-rc7-711_mm-enable_swaptoken_only_when_swap_full.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-711_mm-enable_swaptoken_only_when_swap_full.patch
rename to packages/linux/patches/linux-2.6.38-rc7-711_mm-enable_swaptoken_only_when_swap_full.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-712_mm-background_scan.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-712_mm-background_scan.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-712_mm-background_scan.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-712_mm-background_scan.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-713_mm-idleprio_prio-1.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-713_mm-idleprio_prio-1.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-713_mm-idleprio_prio-1.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-713_mm-idleprio_prio-1.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-714_mm-lru_cache_add_lru_tail.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-714_mm-lru_cache_add_lru_tail.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-714_mm-lru_cache_add_lru_tail.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-714_mm-lru_cache_add_lru_tail.patch.disabled
diff --git a/packages/linux/patches/linux-2.6.38-rc6-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-2.6.38-rc7-716_mm-zero_swappiness.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-716_mm-zero_swappiness.patch
rename to packages/linux/patches/linux-2.6.38-rc7-716_mm-zero_swappiness.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-717_preempt-desktop-tune.patch b/packages/linux/patches/linux-2.6.38-rc7-717_preempt-desktop-tune.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-717_preempt-desktop-tune.patch
rename to packages/linux/patches/linux-2.6.38-rc7-717_preempt-desktop-tune.patch
diff --git a/packages/linux/patches/linux-2.6.38-rc6-718_sched-add-above-background-load-function.patch.disabled b/packages/linux/patches/linux-2.6.38-rc7-718_sched-add-above-background-load-function.patch.disabled
similarity index 100%
rename from packages/linux/patches/linux-2.6.38-rc6-718_sched-add-above-background-load-function.patch.disabled
rename to packages/linux/patches/linux-2.6.38-rc7-718_sched-add-above-background-load-function.patch.disabled