Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next

Conflicts: packages/initramfs/sysutils/busybox-initramfs/scripts/init projects/Fusion/linux/linux.x86_64.conf
2025-07-24 11:16:51 +00:00 · 2011-06-14 09:21:11 +02:00 · 2011-06-14 09:21:11 +02:00 · b771459332
commit b771459332
parent 54d715ece2 67b582fd89
60 changed files with 847 additions and 3371 deletions
--- a/packages/3rdparty/download/CouchPotato/meta
+++ b/packages/3rdparty/download/CouchPotato/meta
@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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="CouchPotato"
+PKG_VERSION="2504efc"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/RuudBurger/CouchPotato"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="Python SABnzbd"
+PKG_BUILD_DEPENDS="toolchain Python"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="CouchPotato: automated movie downloading."
+PKG_LONGDESC="CouchPotato: automated movie downloading."
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/addons/service/downloadmanager/SABnzbd/meta
+++ b/packages/addons/service/downloadmanager/SABnzbd/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.1"
-PKG_REV="2"
+PKG_VERSION="0.6.4"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
@ -32,7 +32,6 @@ PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
 PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."

-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
+PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"
--- a/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch
+++ b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch
@ -1,7 +1,24 @@
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl
--- SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl	2011-05-23 20:05:59.254145174 +0200
-@@ -109,49 +109,6 @@
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl	2011-06-08 00:02:34.000000000 +0200
+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl	2011-06-13 16:37:49.027611932 +0200
+@@ -76,16 +76,6 @@
+           <span class="component-desc">$T('explain-dirscan_speed')</span>
+         </label>
+       </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="script_dir">
+-          <span class="component-title">$T('opt-script_dir')</span>
+-          <input type="text" size="50" name="script_dir" id="script_dir" value="$script_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-script_dir')</span>
+-        </label>
+-      </div>
+       <div class="field-pair alt">
+         <label class="nocheck clearfix" for="email_dir">
+           <span class="component-title">$T('opt-email_dir')</span>
+@@ -109,49 +99,6 @@
     </fieldset>
   </div><!-- /component-group1 -->
 
@ -51,9 +68,9 @@ diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl SABn
   <div class="component-group-last clearfix">
     <div class="component-group-desc">
       <h3>&nbsp;</h3>
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl
--- SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl	2011-05-23 20:09:03.985485852 +0200
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl	2011-06-08 00:02:34.000000000 +0200
+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl	2011-06-13 16:35:26.411903234 +0200
@@ -14,82 +14,6 @@
     </div>
     <fieldset class="component-group-list">
@ -188,9 +205,9 @@ diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl SABnzbd-
     </fieldset>
   </div><!-- /component-group2 -->
 
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl
--- SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl	2011-05-23 20:09:53.829117059 +0200
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl	2011-06-08 00:02:34.000000000 +0200
+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl	2011-06-13 16:35:26.446903654 +0200
@@ -12,20 +12,6 @@
       <h3>$T('swtag-general')</h3>
     </div>
--- a/packages/3rdparty/download/SickBeard/meta
+++ b/packages/3rdparty/download/SickBeard/meta
@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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="SickBeard"
+PKG_VERSION="cb76543"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/midgetspy/Sick-Beard"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="Python SABnzbd Cheetah"
+PKG_BUILD_DEPENDS="toolchain Python Cheetah"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="SickBeard: automated TV show downloading."
+PKG_LONGDESC="SickBeard: automated TV show downloading."
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-001-remove_logo_update-header_and_donate_button-0.1.patch
+++ b/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-001-remove_logo_update-header_and_donate_button-0.1.patch
@ -0,0 +1,44 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config.tmpl	2011-04-22 19:15:10.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl	2011-04-23 03:57:14.515808144 +0200
+@@ -24,9 +24,4 @@
+ </table>
+ </div>
+ 
+-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
+-    <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
+-    <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
+-</tr></table>
+-
+ #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-22 19:15:10.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.088665913 +0200
+@@ -147,19 +147,6 @@
+ </head>
+ 
+ <body>
+-#if $sickbeard.NEWEST_VERSION_STRING:
+-<div id="upgrade-notification">
+-    <div>
+-        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
+-    </div>
+-</div>
+-<div id="header-fix"></div>
+-#end if
+-<div id="header">
+-    <a name="top"></a>
+-    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
+-    <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
+-</div>
+ <ul id="MainMenu" class="sf-menu">
+             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
+                 <ul>
+@@ -197,7 +184,6 @@
+                         <li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
+                 </ul>
+             </li>
+-            <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
+ </ul>
+ #if $varExists('submenu'):
+ <div id="SubMenu">
--- a/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-002-remove_default_settings-0.3.patch
+++ b/packages/3rdparty/download/SickBeard/patches/SickBeard-cb76543-002-remove_default_settings-0.3.patch
@ -0,0 +1,74 @@
+diff -Naur SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl
+--- SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl	2011-04-23 03:55:23.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl	2011-04-23 18:01:29.330455515 +0200
+@@ -484,48 +484,6 @@
+ 
+                 </div>
+ 
+-
+-                <div id="core-component-group7" class="component-group clearfix">
+-                    <div class="component-group-desc">
+-                        <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="Libnotify" title="Libnotify" width="16" height="16" /> Libnotify</a></h3>
+-                        <p>The standard desktop notification API for Linux/*nix systems.  This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
+-                    </div>
+-
+-                    <fieldset class="component-group-list">
+-                        <div class="field-pair">
+-                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="use_libnotify">
+-                                <span class="component-title">Enable</span>
+-                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div id="content_use_libnotify">
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# /> 
+-                            <label class="clearfix" for="libnotify_notify_onsnatch">
+-                                <span class="component-title">Notify on Snatch</span>
+-                                <span class="component-desc">Send notification when we start a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="field-pair">
+-                            <input type="checkbox" name="libnotify_notify_ondownload" id="libnotify_notify_ondownload" #if $sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+-                            <label class="clearfix" for="libnotify_notify_ondownload">
+-                                <span class="component-title">Notify on Download</span>
+-                                <span class="component-desc">Send notification when we finish a download?</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
+-                        <input type="button" value="Test Libnotify" id="testLibnotify" />
+-                        <input type="submit" class="config_submitter" value="Save Changes" />
+-
+-                        </div><!-- /content_use_libnotify //-->
+-
+-                    </fieldset>
+-                </div><!-- /component-group //-->
+-
+                 <div id="core-component-group8" class="component-group clearfix">
+ 
+                     <div class="component-group-desc">
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
+--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl	2011-04-23 03:59:09.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl	2011-04-23 14:24:01.035048035 +0200
+@@ -172,7 +172,6 @@
+             </li>
+             <li id="NAVconfig"><a href="$sbRoot/config">Config</a>
+                 <ul>
+-                        <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
+                         <li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
+                         <li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
+                         <li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
+diff -Naur SickBeard-48caf04/sickbeard/webserve.py SickBeard-48caf04.patch/sickbeard/webserve.py
+--- SickBeard-48caf04/sickbeard/webserve.py	2011-04-23 03:55:23.000000000 +0200
+++ SickBeard-48caf04.patch/sickbeard/webserve.py	2011-04-23 17:55:09.270813146 +0200
+@@ -583,7 +583,6 @@
+ 
+ 
+ ConfigMenu = [
+-    { 'title': 'General',           'path': 'config/general/'          },
+     { 'title': 'Search Settings',   'path': 'config/search/'           },
+     { 'title': 'Search Providers',  'path': 'config/providers/'        },
+     { 'title': 'Post Processing',   'path': 'config/postProcessing/'   },
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/addon
@ -22,12 +22,11 @@

 . config/options $1

-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
-  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
  cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $BUILD/par2cmdline*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/par2cmdline-*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin

@ -35,3 +34,12 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
  cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
  cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
  cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
+  cp -PR $BUILD/SABnzbd-*/* $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
+  cp -PR $BUILD/SickBeard-*/* $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
+  cp -PR $BUILD/CouchPotato-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
@ -0,0 +1,2 @@
+0.99.1
+- initial version SABnzbd-Suite
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/icon/icon.png
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/icon/icon.png
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
@ -0,0 +1,38 @@
+################################################################################
+#      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="SABnzbd-Suite"
+PKG_VERSION="0.99"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.openelec.tv"
+PKG_URL=""
+PKG_DEPENDS="Python"
+PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard and Couchpotato in one Addon"
+PKG_LONGDESC="SABnzbd-Suite makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.service
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.service
@ -0,0 +1,299 @@
+#!/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
+################################################################################
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite"
+
+  SABNZBDSUITE_SETTINGS="$ADDON_HOME/settings.xml"
+  SABNZBD_SETTINGS="$ADDON_HOME/sabnzbd.ini"
+  SICKBEARD_SETTINGS="$ADDON_HOME/config.ini"
+  COUCHPOTATO_SETTINGS="$ADDON_HOME/couchpotato.ini"
+  XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
+
+  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
+
+################################################################################
+# default sabnzbd values
+################################################################################
+  SABNZBD_HOST="127.0.0.1"
+  SABNZBD_PORT="8081"
+  SABNZBD_DISABLEAPIKEY="0"
+  SABNZBD_CHECKRELEASE="0"
+  SABNZBD_LAUNCHBROWSER="0"
+
+  SABNZBD_HTTPPORT="8081"
+  SABNZBD_HTTPSPORT="9081"
+  SABNZBD_HTTPSCERT="server.cert"
+  SABNZBD_HTTPSKEY="server.key"
+
+  SABNZBD_SKIN="Plush"
+  SABNZBD_SKIN2="Plush"
+  SABNZBD_WEBCOLOR="gold"
+  SABNZBD_WEBCOLOR2="gold"
+
+  SABNZBD_LOGDIR="logs"
+  SABNZBD_ADMINDIR="admin"
+  SABNZBD_BACKUPDIR="backup"
+  SABNZBD_SCRIPTDIR="scripts"
+
+  SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete"
+  SABNZBD_COMPLETEDIR="/storage/downloads"
+  SABNZBD_WATCHDIR="/storage/downloads/watch"
+
+################################################################################
+# default sickbeard values
+################################################################################
+  SICKBEARD_LOGDIR="log"
+  SICKBEARD_CACHEDIR="cache"
+  SICKBEARD_PORT="8082"
+  SICKBEARD_LAUNCHBROWSER="0"
+  SICKBEARD_VERSIONCHECK="0"
+  SICKBEARD_USEIPV6="0"
+  SICKBEARD_WEBLOG="0"
+
+  SICKBEARD_USEXBMC="1"
+  SICKBEARD_METADATAXBMC="1|1|1|1|1|1"
+
+################################################################################
+# default couchpotato values
+################################################################################
+  COUCHPOTATO_LAUNCHBROWSER="False"
+  COUCHPOTATO_VERSIONCHECK="False"
+  COUCHPOTATO_PORT="8083"
+  COUCHPOTATO_USEXBMC="True"
+  COUCHPOTATO_UPDATEXBMC="True"
+
+################################################################################
+# setup functions
+################################################################################
+
+write_sabnzbd_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$SABNZBD_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+write_sickbeard_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$SICKBEARD_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+write_couchpotato_ini() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$COUCHPOTATO_SETTINGS \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+read_sabconfig() {
+python $ADDON_DIR/bin/ini_tool --action=read \
+                               --file=$SABNZBD_SETTINGS \
+                               --option="$1:$2"
+}
+
+
+read_xbmcconfig() {
+grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
+}
+
+write_ini_postprocess() {
+python $ADDON_DIR/bin/ini_tool --action=write \
+                               --file=$ADDON_HOME/$SABNZBD_SCRIPTDIR/autoProcessTV.cfg \
+                               --option="$1:$2" \
+                               --value="$3"
+}
+
+################################################################################
+# read xbmc settings
+################################################################################
+  XBMC_HOST="127.0.0.1"
+  XBMC_PORT=`read_xbmcconfig webserverport`
+  XBMC_USER=`read_xbmcconfig webserverusername`
+  XBMC_PWD=`read_xbmcconfig webserverpassword`
+
+################################################################################
+# create default config
+################################################################################
+
+  mkdir -p $ADDON_HOME
+
+  if [ ! -f "$SABNZBDSUITE_SETTINGS" ]; then
+    cp $ADDON_DIR/settings-default.xml $SABNZBDSUITE_SETTINGS
+  fi
+
+################################################################################
+# read settings from xbmc setup dialog
+################################################################################
+  SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  SICKBEARD_IP="$SABNZBD_IP"
+  COUCHPOTATO_IP="$SABNZBD_IP"
+
+################################################################################
+# setup sabnzbd ini file
+################################################################################
+  if [ -z "$SABNZBD_IP" ]; then
+    SABNZBD_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/sabnzbd.ini" ]; then
+    SABNZBD_FIRSTRUN="yes"
+  fi
+
+  write_sabnzbd_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY
+  write_sabnzbd_ini misc check_new_rel $SABNZBD_CHECKRELEASE
+  write_sabnzbd_ini misc auto_browser $SABNZBD_LAUNCHBROWSER
+  write_sabnzbd_ini misc username $SABNZBD_USER
+  write_sabnzbd_ini misc password $SABNZBD_PWD
+  write_sabnzbd_ini misc port $SABNZBD_HTTPPORT
+  write_sabnzbd_ini misc https_port $SABNZBD_HTTPSPORT
+  write_sabnzbd_ini misc https_cert $SABNZBD_HTTPSCERT
+  write_sabnzbd_ini misc https_key $SABNZBD_HTTPSKEY
+  write_sabnzbd_ini misc host $SABNZBD_IP
+  write_sabnzbd_ini misc web_dir $SABNZBD_SKIN
+  write_sabnzbd_ini misc web_dir2 $SABNZBD_SKIN2
+  write_sabnzbd_ini misc web_color $SABNZBD_WEBCOLOR
+  write_sabnzbd_ini misc web_color2 $SABNZBD_WEBCOLOR2
+  write_sabnzbd_ini misc log_dir $SABNZBD_LOGDIR
+  write_sabnzbd_ini misc admin_dir $SABNZBD_ADMINDIR
+  write_sabnzbd_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR
+  write_sabnzbd_ini misc script_dir $SABNZBD_SCRIPTDIR
+
+
+  if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then
+    mkdir -p "$SABNZBD_INCOMPLETEDIR"
+    mkdir -p "$SABNZBD_COMPLETEDIR"
+    mkdir -p "$SABNZBD_WATCHDIR"
+    write_sabnzbd_ini misc download_dir $SABNZBD_INCOMPLETEDIR
+    write_sabnzbd_ini misc complete_dir $SABNZBD_COMPLETEDIR
+    write_sabnzbd_ini misc dirscan_dir $SABNZBD_WATCHDIR
+
+    write_sabnzbd_ini servers:localhost name "localhost"
+    write_sabnzbd_ini servers:localhost host "localhost"
+    write_sabnzbd_ini servers:localhost port "119"
+    write_sabnzbd_ini servers:localhost enable "0"
+  fi
+
+################################################################################
+# setup postprocessing scripts file
+################################################################################
+  mkdir -p $ADDON_HOME/$SABNZBD_SCRIPTDIR
+    cp -P $ADDON_DIR/SickBeard/autoProcessTV/*.py $ADDON_HOME/$SABNZBD_SCRIPTDIR
+    chmod +x $ADDON_HOME/$SABNZBD_SCRIPTDIR/*.py
+
+  write_ini_postprocess SickBeard host localhost
+  write_ini_postprocess SickBeard port $SICKBEARD_PORT
+  write_ini_postprocess SickBeard username $SABNZBD_USER
+  write_ini_postprocess SickBeard password $SABNZBD_PWD
+
+################################################################################
+# start sabnzbd
+################################################################################
+  python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $ADDON_HOME/sabnzbd.ini -l 0
+
+################################################################################
+# read sabnzbd settings
+################################################################################
+  SABNZBD_APIKEY=`read_sabconfig misc api_key`
+
+################################################################################
+# setup sickbeard ini file
+################################################################################
+  if [ -z "$SICKBEARD_IP" ]; then
+    SICKBEARD_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/config.ini" ]; then
+    SICKBEARD_FIRSTRUN="yes"
+  fi
+
+  write_sickbeard_ini General launch_browser $SICKBEARD_LAUNCHBROWSER
+  write_sickbeard_ini General version_notify $SICKBEARD_VERSIONCHECK
+  write_sickbeard_ini General log_dir $SICKBEARD_LOGDIR
+  write_sickbeard_ini General cache_dir $SICKBEARD_CACHEDIR
+  write_sickbeard_ini General web_port $SICKBEARD_PORT
+  write_sickbeard_ini General web_host $SICKBEARD_IP
+  write_sickbeard_ini General web_ipv6 $SICKBEARD_USEIPV6
+  write_sickbeard_ini General web_log $SICKBEARD_WEBLOG
+  write_sickbeard_ini General web_username $SABNZBD_USER
+  write_sickbeard_ini General web_password $SABNZBD_PWD
+
+  write_sickbeard_ini SABnzbd sab_username $SABNZBD_USER
+  write_sickbeard_ini SABnzbd sab_password $SABNZBD_PWD
+  write_sickbeard_ini SABnzbd sab_apikey $SABNZBD_APIKEY
+  write_sickbeard_ini SABnzbd sab_host "http://$SABNZBD_HOST:$SABNZBD_PORT/"
+
+  write_sickbeard_ini XBMC use_xbmc $SICKBEARD_USEXBMC
+  write_sickbeard_ini XBMC xbmc_host "$XBMC_HOST:$XBMC_PORT"
+  write_sickbeard_ini XBMC xbmc_username $XBMC_USER
+  write_sickbeard_ini XBMC xbmc_password $XBMC_PWD
+
+  if [ "$SICKBEARD_FIRSTRUN" = "yes" ]; then
+    write_sickbeard_ini General metadata_xbmc $SICKBEARD_METADATAXBMC
+  fi
+
+################################################################################
+# start sickbeard
+################################################################################
+  python $ADDON_DIR/SickBeard/SickBeard.py --daemon --datadir $ADDON_HOME
+
+################################################################################
+# setup couchpotato ini file
+################################################################################
+  if [ -z "$COUCHPOTATO_IP" ]; then
+    COUCHPOTATO_IP="0.0.0.0"
+  fi
+
+  if [ ! -f "$ADDON_HOME/couchpotato.ini" ]; then
+    COUCHPOTATO_FIRSTRUN="yes"
+  fi
+
+  write_couchpotato_ini global host $COUCHPOTATO_IP
+  write_couchpotato_ini global port $COUCHPOTATO_PORT
+  write_couchpotato_ini global username $SABNZBD_USER
+  write_couchpotato_ini global password $SABNZBD_PWD
+  write_couchpotato_ini global launchbrowser $COUCHPOTATO_LAUNCHBROWSER
+  write_couchpotato_ini global updater $COUCHPOTATO_VERSIONCHECK
+
+  write_couchpotato_ini Sabnzbd username $SABNZBD_USER
+  write_couchpotato_ini Sabnzbd password $SABNZBD_PWD
+  write_couchpotato_ini Sabnzbd apikey $SABNZBD_APIKEY
+  write_couchpotato_ini Sabnzbd host "$SABNZBD_HOST:$SABNZBD_PORT"
+
+  write_couchpotato_ini XBMC enabled $COUCHPOTATO_USEXBMC
+  write_couchpotato_ini XBMC host "$XBMC_HOST:$XBMC_PORT"
+  write_couchpotato_ini XBMC username $XBMC_USER
+  write_couchpotato_ini XBMC password $XBMC_PWD
+
+  if [ "$COUCHPOTATO_FIRSTRUN" = "yes" ]; then
+    write_couchpotato_ini XBMC updateoneonly $COUCHPOTATO_UPDATEXBMC
+  fi
+
+################################################################################
+# start couchpotato
+################################################################################
+  python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $ADDON_HOME/couchpotato.ini
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/ini_tool
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/ini_tool
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py
@ -20,4 +20,4 @@

 import xbmc, time, os, subprocess

-os.system("SABnzbd.service")
+os.system("SABnzbd-Suite.service")
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>

-	<!-- SABnzbd -->
-	<string id="1000">SABnzbd</string>
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
 	<string id="1010">Gebruikers instellingen</string>
 	<string id="1022">Gebruikersnaam</string>
 	<string id="1023">Wachtwoord</string>
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>

-	<!-- SABnzbd -->
-	<string id="1000">SABnzbd</string>
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
 	<string id="1010">User Settings</string>
 	<string id="1022">Username</string>
 	<string id="1023">Password</string>
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>

-	<!-- SABnzbd -->
-	<string id="1000">SABnzbd</string>
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
 	<string id="1010">Préférences utilisateur</string>
 	<string id="1022">Nom d'utilisateur</string>
 	<string id="1023">Mot de passe</string>
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>

-	<!-- SABnzbd -->
-	<string id="1000">SABnzbd</string>
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
 	<string id="1010">Benutzer Einstellungen</string>
 	<string id="1022">Benutzername</string>
 	<string id="1023">Passwort</string>
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>

-	<!-- SABnzbd -->
-	<string id="1000">SABnzbd</string>
+	<!-- SABnzbd-Suite -->
+	<string id="1000">SABnzbd-Suite</string>
 	<string id="1010">Bruker Instillinger</string>
 	<string id="1022">Brukernavn</string>
 	<string id="1023">Passord</string>
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>

-   <!-- SABnzbd -->
+   <!-- SABnzbd-Suite -->
    <category label="1000">
 		<setting label="1010" type="lsep"/>
 		<setting type="sep" />
--- a/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
+++ b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
@ -1,6 +0,0 @@
-0.99.2
- update to SABnzbd-0.6.1
- rework addon
-
-0.99.1
- initial version SABnzbd-0.6.0RC2
--- a/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service
+++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service
@ -1,110 +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
-################################################################################
-
-ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.SABnzbd"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd"
-LOG_FILE="$ADDON_HOME/service.log"
-SABNZBD_SETTINGS="$ADDON_HOME/settings.xml"
-
-export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
-
-SABNZBD_DISABLEAPIKEY="0"
-SABNZBD_CHECKRELEASE="0"
-SABNZBD_LAUNCHBROWSER="0"
-
-SABNZBD_HTTPPORT="8081"
-SABNZBD_HTTPSPORT="9081"
-SABNZBD_HTTPSCERT="server.cert"
-SABNZBD_HTTPSKEY="server.key"
-
-SABNZBD_SKIN="Plush"
-SABNZBD_SKIN2="Plush"
-SABNZBD_WEBCOLOR="gold"
-SABNZBD_WEBCOLOR2="gold"
-
-SABNZBD_LOGDIR="logs"
-SABNZBD_ADMINDIR="admin"
-SABNZBD_BACKUPDIR="backup"
-
-SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete"
-SABNZBD_COMPLETEDIR="/storage/downloads"
-SABNZBD_WATCHDIR="/storage/downloads/watch"
-
-write_ini() {
-python $ADDON_DIR/bin/ini_tool --action=write \
-                               --file=$ADDON_HOME/sabnzbd.ini \
-                               --option="$1:$2" \
-                               --value="$3"
-}
-
-mkdir -p $ADDON_HOME
-
-if [ ! -f "$SABNZBD_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $SABNZBD_SETTINGS
-fi
-
-if [ ! -f "$ADDON_HOME/sabnzbd.ini" ]; then
-  SABNZBD_FIRSTRUN="yes"
-fi
-
-# use settings from xbmc setup dialog
-SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
-SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
-SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
-
-if [ -z "$SABNZBD_IP" ]; then
-  SABNZBD_IP="0.0.0.0"
-fi
-
-write_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY
-write_ini misc check_new_rel $SABNZBD_CHECKRELEASE
-write_ini misc auto_browser $SABNZBD_LAUNCHBROWSER
-write_ini misc username $SABNZBD_USER
-write_ini misc password $SABNZBD_PWD
-write_ini misc port $SABNZBD_HTTPPORT
-write_ini misc https_port $SABNZBD_HTTPSPORT
-write_ini misc https_cert $SABNZBD_HTTPSCERT
-write_ini misc https_key $SABNZBD_HTTPSKEY
-write_ini misc host $SABNZBD_IP
-write_ini misc web_dir $SABNZBD_SKIN
-write_ini misc web_dir2 $SABNZBD_SKIN2
-write_ini misc web_color $SABNZBD_WEBCOLOR
-write_ini misc web_color2 $SABNZBD_WEBCOLOR2
-write_ini misc log_dir $SABNZBD_LOGDIR
-write_ini misc admin_dir $SABNZBD_ADMINDIR
-write_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR
-
-if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then
-  mkdir -p "$SABNZBD_INCOMPLETEDIR"
-  mkdir -p "$SABNZBD_COMPLETEDIR"
-  mkdir -p "$SABNZBD_WATCHDIR"
-  write_ini misc download_dir $SABNZBD_INCOMPLETEDIR
-  write_ini misc complete_dir $SABNZBD_COMPLETEDIR
-  write_ini misc dirscan_dir $SABNZBD_WATCHDIR
-
-  write_ini servers:localhost name "localhost"
-  write_ini servers:localhost host "localhost"
-  write_ini servers:localhost port "119"
-  write_ini servers:localhost enable "0"
-fi
-
-python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $ADDON_HOME/sabnzbd.ini -l 0
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="Mesa"
-PKG_VERSION="7.10.2"
+PKG_VERSION="7.10.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch
+++ b/packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch
@ -1,15 +0,0 @@
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c	2011-03-02 17:30:39.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c	2011-03-02 17:31:59.000000000 -0800
-@@ -47,9 +47,8 @@
-  */
- #define insert_at_tail_if(atom_list, atom) \
-    do { \
-      struct radeon_state_atom* __atom = (atom); \
-      if (__atom->check) \
-	 insert_at_tail((atom_list), __atom); \
-+      if ((atom)->check) \
-+	 insert_at_tail((atom_list), (atom)); \
-    } while(0)
- 
- void r200SetUpAtomList( r200ContextPtr rmesa )
--- a/packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch
+++ b/packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch
@ -1,208 +0,0 @@
-diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h
--- Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h	2010-12-15 15:02:44.000000000 -0800
-+++ Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h	2011-03-02 17:31:09.000000000 -0800
-@@ -15,6 +15,8 @@
- 
- #include "nouveau/nouveau_winsys.h"
- #include "nouveau/nouveau_gldefs.h"
-+/* Hack to silence warnings caused by nouveau/nouveau_stateobj.h using BEGIN_BIND marcro */
-+#include <nouveau/nv04_pushbuf.h>
- #include "nouveau/nouveau_stateobj.h"
- #include "nv50_reg.h"
- 
-diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c	2011-01-25 15:52:45.000000000 -0800
-+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c	2011-03-02 17:31:09.000000000 -0800
-@@ -39,6 +39,7 @@
- #include <nouveau/nouveau_bo.h>
- #include <nouveau/nouveau_notifier.h>
- #include <nouveau/nouveau_grobj.h>
-+#include <nouveau/nv04_pushbuf.h>
- #include "nv04_2d.h"
- 
- #include "nouveau/nv_object.xml.h"
-diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c	2010-12-15 15:02:44.000000000 -0800
-+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c	2011-03-02 17:31:09.000000000 -0800
-@@ -1,4 +1,3 @@
-
- #include "util/u_inlines.h"
- #include "util/u_memory.h"
- #include "util/u_math.h"
-diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c	2011-01-25 15:52:45.000000000 -0800
-+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c	2011-03-02 17:31:09.000000000 -0800
-@@ -10,6 +10,8 @@
- #include "nvfx_resource.h"
- #include "nvfx_tex.h"
- 
-+#include "nouveau/nv04_pushbuf.h"
-+
- #define NV30_3D_CHIPSET_3X_MASK 0x00000003
- #define NV34_3D_CHIPSET_3X_MASK 0x00000010
- #define NV35_3D_CHIPSET_3X_MASK 0x000001e0
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h	2011-03-02 17:31:09.000000000 -0800
-@@ -28,6 +28,7 @@
- #define __NV04_DRIVER_H__
- 
- #include "nv04_context.h"
-+#include "nv04_pushbuf.h"
- 
- enum {
- 	NOUVEAU_STATE_BLEND = NUM_NOUVEAU_STATE,
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c	2011-03-02 17:31:09.000000000 -0800
-@@ -27,6 +27,7 @@
- #include "nouveau_driver.h"
- #include "nouveau_context.h"
- #include "nv10_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- #define NUM_VERTEX_ATTRS 8
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2011-03-02 17:31:09.000000000 -0800
-@@ -30,6 +30,7 @@
- #include "nouveau_util.h"
- #include "nv_object.xml.h"
- #include "nv10_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- static inline unsigned
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c	2011-03-02 17:31:09.000000000 -0800
-@@ -30,6 +30,7 @@
- #include "nv10_3d.xml.h"
- #include "nouveau_util.h"
- #include "nv10_driver.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- #define RC_IN_SHIFT_A	24
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c	2011-03-02 17:31:09.000000000 -0800
-@@ -29,6 +29,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv10_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c	2011-01-25 15:52:45.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c	2011-03-02 17:31:09.000000000 -0800
-@@ -29,6 +29,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv10_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c	2011-03-02 17:31:09.000000000 -0800
-@@ -30,6 +30,7 @@
- #include "nouveau_texture.h"
- #include "nv10_3d.xml.h"
- #include "nouveau_util.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c	2011-03-02 17:31:09.000000000 -0800
-@@ -29,6 +29,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv10_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c	2011-03-02 17:31:09.000000000 -0800
-@@ -27,6 +27,7 @@
- #include "nouveau_driver.h"
- #include "nouveau_context.h"
- #include "nv20_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- #define NUM_VERTEX_ATTRS 16
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c	2011-03-02 17:31:09.000000000 -0800
-@@ -30,6 +30,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv20_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- static inline unsigned
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c	2011-03-02 17:31:09.000000000 -0800
-@@ -28,6 +28,7 @@
- #include "nouveau_context.h"
- #include "nv20_3d.xml.h"
- #include "nv10_driver.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c	2011-03-02 17:31:09.000000000 -0800
-@@ -28,6 +28,7 @@
- #include "nouveau_context.h"
- #include "nouveau_gldefs.h"
- #include "nv20_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c	2011-03-02 17:31:09.000000000 -0800
-@@ -29,6 +29,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv20_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c	2011-03-02 17:31:09.000000000 -0800
-@@ -30,6 +30,7 @@
- #include "nouveau_texture.h"
- #include "nv20_3d.xml.h"
- #include "nouveau_util.h"
-+#include "nv04_driver.h"
- #include "nv20_driver.h"
- 
- void
-diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c	2010-12-14 13:43:15.000000000 -0800
-+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c	2011-03-02 17:31:09.000000000 -0800
-@@ -29,6 +29,7 @@
- #include "nouveau_gldefs.h"
- #include "nouveau_util.h"
- #include "nv20_3d.xml.h"
-+#include "nv04_driver.h"
- #include "nv10_driver.h"
- #include "nv20_driver.h"
- 
--- a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch
+++ b/packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch
@ -1,12 +0,0 @@
-diff -Naur Mesa-7.10.2-old/configure.ac Mesa-7.10.2-new/configure.ac
--- Mesa-7.10.2-old/configure.ac	2011-02-11 14:49:47.000000000 -0800
-+++ Mesa-7.10.2-new/configure.ac	2011-05-05 16:31:18.000000000 -0700
-@@ -1551,7 +1551,7 @@
-     if test "x$LLVM_CONFIG" != xno; then
- 	LLVM_VERSION=`$LLVM_CONFIG --version`
- 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
-	LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
-+	LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++"
- 
- 	if test "x$HAS_UDIS86" != xno; then
- 	    LLVM_LIBS="$LLVM_LIBS -ludis86"
--- a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch
+++ b/packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch
@ -1,12 +0,0 @@
-diff -Naur Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile
--- Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile	2011-01-04 09:44:17.000000000 -0800
-+++ Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile	2011-05-05 15:48:06.000000000 -0700
-@@ -71,7 +71,7 @@
- 
- LDFLAGS += $(LLVM_LDFLAGS)
- LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
-LD=g++
-+LD = $(CXX)
- 
- $(PROGS): lp_test_main.o libllvmpipe.a
- 
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@ -117,8 +117,8 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
  }

  mount_part() {
-    progress "check filesystem $1 ..."
-      /sbin/fsck -M -T -a $1 > /dev/null 2>&1
+#    progress "check filesystem $1 ..."
+#      /sbin/fsck -M -T -a $1 > /dev/null 2>&1

      for i in 1 2 3 4 5 6 7 8 9 10; do
        ERR_ENV=1
@ -148,6 +148,16 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
    fi
  }

+  hfsdiskprep() {
+    for DEV in `/bin/busybox ls /dev/sd*`; do
+      FS_TYPE=$(/sbin/blkid -o value -s TYPE $DEV)
+      if [ "$FS_TYPE" = "hfs" -o "$FS_TYPE" = "hfsplus" ]; then
+        progress "check filesystem $DEV ..."
+        /sbin/fsck_hfs -r -y $DEV > /dev/null 2>&1
+      fi
+    done
+  }
+
  mount_nbd() {
    retry_nr=0
    retry_delay=20
@ -182,6 +192,11 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"

  mount_disk() {

+  # deal with hfs partitions
+    if [ -x /sbin/fsck_hfs ]; then
+      hfsdiskprep
+    fi
+
    mount_part "$boot" "/flash" "ro,noatime"
    show_splash

--- a/packages/linux-drivers/asix-ax887xx/build
+++ b/packages/linux-drivers/asix-ax887xx/build
@ -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
+
+cd $PKG_BUILD
+  make V=1 CC=$CC KDIR=$(kernel_path)
--- a/packages/linux-drivers/asix-ax887xx/install
+++ b/packages/linux-drivers/asix-ax887xx/install
@ -0,0 +1,33 @@
+#!/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
+
+VER=`ls $BUILD/linux*/modules/lib/modules`
+
+mkdir -p $INSTALL/lib/modules/$VER/asix-ax887xx
+  cp $PKG_BUILD/asix.ko $INSTALL/lib/modules/$VER/asix-ax887xx
+
+$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
+for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
+  rm -f $i
+done
--- a/packages/linux-drivers/asix-ax887xx/meta
+++ b/packages/linux-drivers/asix-ax887xx/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="asix-ax887xx"
+PKG_VERSION="4.1.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.asix.com.tw"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver"
+PKG_SHORTDESC="asix-ax887xx: ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"
+PKG_LONGDESC="ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/linux-drivers/asix-ax887xx/need_unpack
+++ b/packages/linux-drivers/asix-ax887xx/need_unpack
@ -0,0 +1,32 @@
+#!/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
+
+STAMP=$STAMPS/$1/unpack
+
+test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PKG_DIR/url -nt $STAMP -o \
+     $PKG_DIR/meta -nt $STAMP && rm -f $STAMP
+
+exit 0
--- a/packages/linux-drivers/asix-ax887xx/patches/asix-ax887xx-4.1.0-Makefile.patch
+++ b/packages/linux-drivers/asix-ax887xx/patches/asix-ax887xx-4.1.0-Makefile.patch
@ -0,0 +1,12 @@
+diff -Naur asix-ax887xx-4.1.0/Makefile asix-ax887xx-4.1.0.patch/Makefile
+--- asix-ax887xx-4.1.0/Makefile	2011-02-22 01:54:38.000000000 +0100
+++ asix-ax887xx-4.1.0.patch/Makefile	2011-06-14 03:58:46.714369862 +0200
+@@ -2,7 +2,7 @@
+ TARGET	= asix
+ OBJS	= asix.o
+ MDIR	= drivers/net/usb
+-KDIR	= /lib/modules/$(CURRENT)/build
+KDIR	:= /lib/modules/$(CURRENT)/build
+ SUBLEVEL= $(shell uname -r | cut -d '.' -f 3 | cut -d '.' -f 1 | cut -d '-' -f 1 | cut -d '_' -f 1)
+ 
+ ifneq (,$(filter $(SUBLEVEL),14 15 16 17 18 19 20 21))
--- a/packages/linux-drivers/install
+++ b/packages/linux-drivers/install
@ -23,6 +23,7 @@
 . config/options

 for drivers in "$ADDITIONAL_DRIVERS"; do
+  [ $drivers = asix-ax887xx ] && $SCRIPTS/install asix-ax887xx
  [ $drivers = bcm_sta ] && $SCRIPTS/install bcm_sta
  [ $drivers = rtl8192se ] && $SCRIPTS/install rtl8192se
 done
--- a/packages/python/devel/pygobject/meta
+++ b/packages/python/devel/pygobject/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="pygobject"
-PKG_VERSION="2.28.0"
+PKG_VERSION="2.28.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
--- a/packages/sysutils/busybox/meta
+++ b/packages/sysutils/busybox/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="busybox"
-PKG_VERSION="1.18.4"
+PKG_VERSION="1.18.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/sysutils/busybox/patches/busybox-1.18.4-hush.patch
+++ b/packages/sysutils/busybox/patches/busybox-1.18.4-hush.patch
@ -1,160 +0,0 @@
--- busybox-1.18.4/shell/hush.c
-+++ busybox-1.18.4-hush/shell/hush.c
-@@ -427,6 +427,15 @@ enum {
- /* Used for initialization: o_string foo = NULL_O_STRING; */
- #define NULL_O_STRING { NULL }
- 
-+#ifndef debug_printf_parse
-+static const char *const assignment_flag[] = {
-+	"MAYBE_ASSIGNMENT",
-+	"DEFINITELY_ASSIGNMENT",
-+	"NOT_ASSIGNMENT",
-+	"WORD_IS_KEYWORD",
-+};
-+#endif
-+
- /* I can almost use ordinary FILE*.  Is open_memstream() universally
-  * available?  Where is it documented? */
- typedef struct in_str {
-@@ -2885,24 +2894,24 @@ static const struct reserved_combo* matc
- 	 */
- 	static const struct reserved_combo reserved_list[] = {
- # if ENABLE_HUSH_IF
-		{ "!",     RES_NONE,  NOT_ASSIGNMENT , 0 },
-		{ "if",    RES_IF,    WORD_IS_KEYWORD, FLAG_THEN | FLAG_START },
-		{ "then",  RES_THEN,  WORD_IS_KEYWORD, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
-		{ "elif",  RES_ELIF,  WORD_IS_KEYWORD, FLAG_THEN },
-		{ "else",  RES_ELSE,  WORD_IS_KEYWORD, FLAG_FI   },
-		{ "fi",    RES_FI,    NOT_ASSIGNMENT , FLAG_END  },
-+		{ "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
-+		{ "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
-+		{ "then",  RES_THEN,  MAYBE_ASSIGNMENT, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
-+		{ "elif",  RES_ELIF,  MAYBE_ASSIGNMENT, FLAG_THEN },
-+		{ "else",  RES_ELSE,  MAYBE_ASSIGNMENT, FLAG_FI   },
-+		{ "fi",    RES_FI,    NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- # if ENABLE_HUSH_LOOPS
-		{ "for",   RES_FOR,   NOT_ASSIGNMENT , FLAG_IN | FLAG_DO | FLAG_START },
-		{ "while", RES_WHILE, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
-		{ "until", RES_UNTIL, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
-		{ "in",    RES_IN,    NOT_ASSIGNMENT , FLAG_DO   },
-		{ "do",    RES_DO,    WORD_IS_KEYWORD, FLAG_DONE },
-		{ "done",  RES_DONE,  NOT_ASSIGNMENT , FLAG_END  },
-+		{ "for",   RES_FOR,   NOT_ASSIGNMENT  , FLAG_IN | FLAG_DO | FLAG_START },
-+		{ "while", RES_WHILE, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
-+		{ "until", RES_UNTIL, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
-+		{ "in",    RES_IN,    NOT_ASSIGNMENT  , FLAG_DO   },
-+		{ "do",    RES_DO,    MAYBE_ASSIGNMENT, FLAG_DONE },
-+		{ "done",  RES_DONE,  NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- # if ENABLE_HUSH_CASE
-		{ "case",  RES_CASE,  NOT_ASSIGNMENT , FLAG_MATCH | FLAG_START },
-		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT , FLAG_END  },
-+		{ "case",  RES_CASE,  NOT_ASSIGNMENT  , FLAG_MATCH | FLAG_START },
-+		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- 	};
- 	const struct reserved_combo *r;
-@@ -2968,6 +2977,7 @@ static int reserved_word(o_string *word,
- 	ctx->ctx_res_w = r->res;
- 	ctx->old_flag = r->flag;
- 	word->o_assignment = r->assignment_flag;
-+	debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
- 
- 	if (ctx->old_flag & FLAG_END) {
- 		struct parse_context *old;
-@@ -3034,18 +3044,6 @@ static int done_word(o_string *word, str
- 		debug_printf_parse("word stored in rd_filename: '%s'\n", word->data);
- 		ctx->pending_redirect = NULL;
- 	} else {
-		/* If this word wasn't an assignment, next ones definitely
-		 * can't be assignments. Even if they look like ones. */
-		if (word->o_assignment != DEFINITELY_ASSIGNMENT
-		 && word->o_assignment != WORD_IS_KEYWORD
-		) {
-			word->o_assignment = NOT_ASSIGNMENT;
-		} else {
-			if (word->o_assignment == DEFINITELY_ASSIGNMENT)
-				command->assignment_cnt++;
-			word->o_assignment = MAYBE_ASSIGNMENT;
-		}
-
- #if HAS_KEYWORDS
- # if ENABLE_HUSH_CASE
- 		if (ctx->ctx_dsemicolon
-@@ -3065,8 +3063,9 @@ static int done_word(o_string *word, str
- 		 && ctx->ctx_res_w != RES_CASE
- # endif
- 		) {
-			debug_printf_parse("checking '%s' for reserved-ness\n", word->data);
-			if (reserved_word(word, ctx)) {
-+			int reserved = reserved_word(word, ctx);
-+			debug_printf_parse("checking for reserved-ness: %d\n", reserved);
-+			if (reserved) {
- 				o_reset_to_empty_unquoted(word);
- 				debug_printf_parse("done_word return %d\n",
- 						(ctx->ctx_res_w == RES_SNTX));
-@@ -3087,6 +3086,23 @@ static int done_word(o_string *word, str
- 					"groups and arglists don't mix\n");
- 			return 1;
- 		}
-+
-+		/* If this word wasn't an assignment, next ones definitely
-+		 * can't be assignments. Even if they look like ones. */
-+		if (word->o_assignment != DEFINITELY_ASSIGNMENT
-+		 && word->o_assignment != WORD_IS_KEYWORD
-+		) {
-+			word->o_assignment = NOT_ASSIGNMENT;
-+		} else {
-+			if (word->o_assignment == DEFINITELY_ASSIGNMENT) {
-+				command->assignment_cnt++;
-+				debug_printf_parse("++assignment_cnt=%d\n", command->assignment_cnt);
-+			}
-+			debug_printf_parse("word->o_assignment was:'%s'\n", assignment_flag[word->o_assignment]);
-+			word->o_assignment = MAYBE_ASSIGNMENT;
-+		}
-+		debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
-+
- 		if (word->has_quoted_part
- 		 /* optimization: and if it's ("" or '') or ($v... or `cmd`...): */
- 		 && (word->data[0] == '\0' || word->data[0] == SPECIAL_VAR_SYMBOL)
-@@ -4105,6 +4121,7 @@ static struct pipe *parse_stream(char **
- 			 && is_well_formed_var_name(dest.data, '=')
- 			) {
- 				dest.o_assignment = DEFINITELY_ASSIGNMENT;
-+				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			}
- 			continue;
- 		}
-@@ -4154,6 +4171,7 @@ static struct pipe *parse_stream(char **
- 					heredoc_cnt = 0;
- 				}
- 				dest.o_assignment = MAYBE_ASSIGNMENT;
-+				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 				ch = ';';
- 				/* note: if (is_blank) continue;
- 				 * will still trigger for us */
-@@ -4203,6 +4221,7 @@ static struct pipe *parse_stream(char **
- 			}
- 			done_pipe(&ctx, PIPE_SEQ);
- 			dest.o_assignment = MAYBE_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			/* Do we sit outside of any if's, loops or case's? */
- 			if (!HAS_KEYWORDS
- 			 IF_HAS_KEYWORDS(|| (ctx.ctx_res_w == RES_NONE && ctx.old_flag == 0))
-@@ -4309,6 +4328,7 @@ static struct pipe *parse_stream(char **
- 			/* ch is a special char and thus this word
- 			 * cannot be an assignment */
- 			dest.o_assignment = NOT_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 		}
- 
- 		/* Note: nommu_addchr(&ctx.as_string, ch) is already done */
-@@ -4406,6 +4426,7 @@ static struct pipe *parse_stream(char **
- 			/* We just finished a cmd. New one may start
- 			 * with an assignment */
- 			dest.o_assignment = MAYBE_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			break;
- 		case '&':
- 			if (done_word(&dest, &ctx)) {
--- a/packages/sysutils/busybox/patches/busybox-1.18.5-00_halt_no_init.patch
+++ b/packages/sysutils/busybox/patches/busybox-1.18.5-00_halt_no_init.patch
--- a/packages/sysutils/busybox/patches/busybox-1.18.5-01_check_cc.patch
+++ b/packages/sysutils/busybox/patches/busybox-1.18.5-01_check_cc.patch
--- a/packages/sysutils/busybox/patches/busybox-1.18.5-02_user_modprobe.d_dir-0.1.patch
+++ b/packages/sysutils/busybox/patches/busybox-1.18.5-02_user_modprobe.d_dir-0.1.patch
--- a/packages/sysutils/dbus/meta
+++ b/packages/sysutils/dbus/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="dbus"
-PKG_VERSION="1.4.10"
+PKG_VERSION="1.4.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/sysutils/util-linux/udev.d.bk/10-fsck.rules
+++ b/packages/sysutils/util-linux/udev.d.bk/10-fsck.rules
--- a/packages/toolchain/devel/eglibc/meta
+++ b/packages/toolchain/devel/eglibc/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="eglibc"
-PKG_VERSION="2.13-13177"
+PKG_VERSION="2.13-14178"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-Handle_DSOs_without_any_dependency_in_ld.so.patch
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-Handle_DSOs_without_any_dependency_in_ld.so.patch
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-libgcc_eh-1.patch
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-libgcc_eh-1.patch
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-select_fd_type.patch
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-select_fd_type.patch
--- a/packages/toolchain/devel/fakeroot/meta
+++ b/packages/toolchain/devel/fakeroot/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="fakeroot"
-PKG_VERSION="1.15.1"
+PKG_VERSION="1.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@ -97,8 +97,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -230,27 +231,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_FREEZER is not set
@ -329,9 +330,9 @@ CONFIG_NR_CPUS=2
 # CONFIG_SCHED_SMT is not set
 # CONFIG_SCHED_MC is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@ -1027,7 +1028,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
@ -1568,6 +1569,7 @@ CONFIG_DRM_TTM=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
 # CONFIG_DRM_I915 is not set
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_SIS is not set
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -117,10 +117,11 @@
  DVDCSS_SUPPORT="yes"

 # additional drivers to install:
+# asix-ax887xx:     Asix AX887xx USB LAN Driver
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="bcm_sta"
+  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -225,27 +226,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -322,9 +323,9 @@ CONFIG_NR_CPUS=4
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1048,7 +1049,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -117,10 +117,11 @@
  DVDCSS_SUPPORT="yes"

 # additional drivers to install:
+# asix-ax887xx:     Asix AX887xx USB LAN Driver
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS=""
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -225,27 +226,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -324,9 +325,9 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1189,7 +1190,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
@ -1935,6 +1936,7 @@ CONFIG_DRM_TTM=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=y
 CONFIG_DRM_I915_KMS=y
 # CONFIG_DRM_MGA is not set
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -117,10 +117,11 @@
  DVDCSS_SUPPORT="yes"

 # additional drivers to install:
+# asix-ax887xx:     Asix AX887xx USB LAN Driver
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="rtl8192se"
+  ADDITIONAL_DRIVERS="asix-ax887xx rtl8192se"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -225,27 +226,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -322,9 +323,9 @@ CONFIG_NR_CPUS=4
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1093,7 +1094,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -223,27 +224,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -295,9 +296,9 @@ CONFIG_NR_CPUS=4
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1042,7 +1043,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
--- a/projects/ION/options
+++ b/projects/ION/options
@ -117,10 +117,11 @@
  DVDCSS_SUPPORT="yes"

 # additional drivers to install:
+# asix-ax887xx:     Asix AX887xx USB LAN Driver
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="rtl8192se"
+  ADDITIONAL_DRIVERS="asix-ax887xx rtl8192se"

 # build with network support (yes / no)
  NETWORK="yes"
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -225,27 +226,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -323,9 +324,9 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1107,7 +1108,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
@ -1787,6 +1788,7 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=y
 CONFIG_DRM_I915_KMS=y
 # CONFIG_DRM_MGA is not set
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@ -98,8 +98,9 @@ CONFIG_IRQ_FORCED_THREADING=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@ -223,27 +224,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_FREEZER=y
@ -297,9 +298,9 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@ -1057,7 +1058,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
+# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
@ -1729,6 +1730,7 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=y
 CONFIG_DRM_I915_KMS=y
 # CONFIG_DRM_MGA is not set
--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -117,10 +117,11 @@
  DVDCSS_SUPPORT="yes"

 # additional drivers to install:
+# asix-ax887xx:     Asix AX887xx USB LAN Driver
 # bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS=""
+  ADDITIONAL_DRIVERS="asix-ax887xx"

 # build with network support (yes / no)
  NETWORK="yes"