diff --git a/packages/python/system/hotqueue/build b/packages/addons/service/downloadmanager/SABnzbd/addon similarity index 59% rename from packages/python/system/hotqueue/build rename to packages/addons/service/downloadmanager/SABnzbd/addon index 3a7c2afbd8..88dd090e00 100755 --- a/packages/python/system/hotqueue/build +++ b/packages/addons/service/downloadmanager/SABnzbd/addon @@ -22,9 +22,16 @@ . config/options $1 -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 + cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 + cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml -cd $PKG_BUILD +mkdir -p $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 -python setup.py build --cross-compile bdist_egg --exclude-source-files +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 diff --git a/packages/addons/service/downloadmanager/SABnzbd/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt new file mode 100644 index 0000000000..2703b7f6db --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt @@ -0,0 +1,6 @@ +0.99.2 +- update to SABnzbd-0.6.1 +- rework addon + +0.99.1 +- initial version SABnzbd-0.6.0RC2 diff --git a/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml new file mode 100644 index 0000000000..20c2a69b4e --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png new file mode 100644 index 0000000000..2c62900063 Binary files /dev/null and b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png differ diff --git a/packages/python/system/redis-py/meta b/packages/addons/service/downloadmanager/SABnzbd/meta similarity index 56% rename from packages/python/system/redis-py/meta rename to packages/addons/service/downloadmanager/SABnzbd/meta index b8ca73e808..59416fecd8 100644 --- a/packages/python/system/redis-py/meta +++ b/packages/addons/service/downloadmanager/SABnzbd/meta @@ -18,19 +18,21 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="redis-py" -PKG_VERSION="2.2.4" -PKG_REV="1" +PKG_NAME="SABnzbd" +PKG_VERSION="0.6.1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="OSS" -PKG_SITE="https://github.com/andymccurdy/redis-py" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python distribute redis" -PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" +PKG_SITE="http://sabnzbd.org/" +PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz" +PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline" +PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline" PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="redis-py: the Python interface to the Redis key-value store" -PKG_LONGDESC="This is the Python interface to the Redis key-value store." -PKG_IS_ADDON="no" +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_AUTORECONF="no" diff --git 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 new file mode 100644 index 0000000000..cc59ea4d0f --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch @@ -0,0 +1,214 @@ +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 @@ + + + +-
+-
+-

$T('systemFolders')

+-

$T('base-folder'):
$my_lcldata

+-
+-
+-
+- +- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+-
+- +
+
+

 

+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 +@@ -14,82 +14,6 @@ +
+
+
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+ +-
+
+
+ +@@ -152,36 +69,6 @@ + $T('explain-enable_https') + + +-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+ + + +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 +@@ -12,20 +12,6 @@ +

$T('swtag-general')

+ +
+-
+- 0 then "checked=1" else ""#--> /> +- +-
+-
+- 0 then "checked=1" else ""#--> /> +- +-
+ +
+ 0 then "checked=1" else ""#--> /> diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service new file mode 100755 index 0000000000..1771ab5730 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service @@ -0,0 +1,110 @@ +#!/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 diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool b/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool new file mode 100755 index 0000000000..97f7b4c433 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool @@ -0,0 +1,117 @@ +#!/usr/bin/env python + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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 +################################################################################ + +from configobj import ConfigObj +import sys +import os +import string + +python_major = sys.version_info[0] +python_minor = sys.version_info[1] + +prog="ini_tool" +description="""Read/Write config files. + +Examples: + %(prog)s --file config.ini --action read --option [section:]username + %(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog} + +def option_required_error(option): + parser.print_usage() + print prog + ": error: " + option + " is required" + exit(2) + +if python_major > 2 or (python_major == 2 and python_minor >= 7): + import argparse + + parser = argparse.ArgumentParser( + prog=prog, + description=description, + formatter_class=argparse.RawDescriptionHelpFormatter, + ) + + parser.add_argument('--file', help='file to read/write to/from', required=True) + parser.add_argument('--action', help='read|write', required=True) + parser.add_argument('--option', help='the option key', required=True) + parser.add_argument('--value', help='value to store in the given option (only for write action)') + + options = parser.parse_args() + +else: + import optparse + + parser = optparse.OptionParser( + prog=prog, + description=description, + ) + + parser.add_option('--file', help='file to read/write to/from') + parser.add_option('--action', help='read|write') + parser.add_option('--option', help='the option key') + parser.add_option('--value', help='value to store in the given option (only for write action)') + + (options, args) = parser.parse_args() + + if not options.file: + option_required_error("--file") + if not options.action: + option_required_error("--action") + if not options.option: + option_required_error("--option") + + +if options.action != "read" and options.action != "write": + print "'" + options.action + "' is not a valid action" + parser.print_help() + exit(2) + +if options.action == "read" and not os.path.isfile(options.file): + print "'" + options.file + "' is not a file" + exit(2) + +config = ConfigObj(options.file) +keys = string.split(options.option, ":") +key_len = len(keys) +current_section = config + +if options.action == 'read': + i = 1 + for key in keys: + if i == key_len: + print current_section[key] + exit(0) + else: + current_section = current_section[key] + i += 1 +elif options.action == 'write': + i = 1 + for key in keys: + if i == key_len: + current_section[key] = options.value + elif key not in current_section: + current_section[key] = {} + current_section = current_section[key] + i += 1 + + config.write() +else: + exit(1) \ No newline at end of file diff --git a/packages/sysutils/redis/build b/packages/addons/service/downloadmanager/SABnzbd/source/default.py old mode 100755 new mode 100644 similarity index 91% rename from packages/sysutils/redis/build rename to packages/addons/service/downloadmanager/SABnzbd/source/default.py index ce39c77de2..726a943a06 --- a/packages/sysutils/redis/build +++ b/packages/addons/service/downloadmanager/SABnzbd/source/default.py @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) @@ -20,11 +18,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +import xbmc, time, os, subprocess -cd $PKG_BUILD - -make - -$STRIP src/redis-server -$STRIP src/redis-cli +os.system("SABnzbd.service") diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml new file mode 100644 index 0000000000..69ffefaeb3 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml @@ -0,0 +1,12 @@ + + + + + SABnzbd + Gebruikers instellingen + Gebruikersnaam + Wachtwoord + Netwerk instellingen + Toegestane IP adressen + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml new file mode 100644 index 0000000000..68cb162a30 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml @@ -0,0 +1,12 @@ + + + + + SABnzbd + User Settings + Username + Password + Network Settings + Allowed IP addresses + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml new file mode 100644 index 0000000000..fb3f0fc1f9 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml @@ -0,0 +1,12 @@ + + + + + SABnzbd + Préférences utilisateur + Nom d'utilisateur + Mot de passe + Préférences réseau + Adresses IP autorisées + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml new file mode 100644 index 0000000000..ad209d26c7 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml @@ -0,0 +1,12 @@ + + + + + SABnzbd + Benutzer Einstellungen + Benutzername + Passwort + Netzwerk Einstellungen + Erlaubte IP Adressen + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml new file mode 100644 index 0000000000..a70961eb4c --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml @@ -0,0 +1,12 @@ + + + + + SABnzbd + Bruker Instillinger + Brukernavn + Passord + Nettverksinstillinger + Tilatte IP addresser + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml new file mode 100644 index 0000000000..8ee2bb0ab2 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt index b37ad49d4c..9533695ab5 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt @@ -1,3 +1,6 @@ +0.99.5 +- update to hts-tvheadend-ca68ed4 + 0.99.4 - change icon diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta index 8bd7b801e6..30e4146356 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/meta +++ b/packages/addons/service/multimedia/hts-tvheadend/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="hts-tvheadend" -PKG_VERSION="90e3570" -PKG_REV="4" +PKG_VERSION="ca68ed4" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" @@ -31,7 +31,7 @@ PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." -PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes" +PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.service" diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch new file mode 100644 index 0000000000..d2c8afac28 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch @@ -0,0 +1,34 @@ +diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include "addons/Skin.h" ++#include "utils/log.h" + #include "tinyXML/tinyxml.h" + #include "utils/CharsetConverter.h" + #include "CriticalSection.h" +@@ -202,7 +203,22 @@ + g_callQueue.erase(iter); + lock.Leave(); + if (p.func) ++ { + p.func(p.args); ++ ++ // Since the callback is likely to make it into python, and since ++ // not all of the callback functions handle errors, the error state ++ // may remain set from the previous call. As a result subsequent calls ++ // to callback functions exhibit odd behavior difficult to debug. ++ if (PyErr_Occurred()) ++ { ++ CLog::Log(LOGERROR,"Exception in python script callback execution"); ++ ++ // This clears the python error state and prints it to the log ++ PyErr_Print(); ++ } ++ ++ } + //(*((*iter).first))((*iter).second); + lock.Enter(); + iter = g_callQueue.begin(); diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/devel/Cheetah/build +++ b/packages/python/devel/Cheetah/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/devel/Cheetah/install +++ b/packages/python/devel/Cheetah/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/security/pyOpenSSL/build b/packages/python/security/pyOpenSSL/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/security/pyOpenSSL/build +++ b/packages/python/security/pyOpenSSL/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/security/pyOpenSSL/install b/packages/python/security/pyOpenSSL/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/security/pyOpenSSL/install +++ b/packages/python/security/pyOpenSSL/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/system/hotqueue/install b/packages/python/system/hotqueue/install deleted file mode 100755 index d2be73015e..0000000000 --- a/packages/python/system/hotqueue/install +++ /dev/null @@ -1,30 +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 - -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg diff --git a/packages/python/system/hotqueue/meta b/packages/python/system/hotqueue/meta deleted file mode 100644 index af2c682420..0000000000 --- a/packages/python/system/hotqueue/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="hotqueue" -PKG_VERSION="0.2.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/richardhenry/hotqueue" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python distribute redis-py" -PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="hotqueue a Python library that allows you to use Redis as a message queue within your Python programs" -PKG_LONGDESC="HotQueue is a Python library that allows you to use Redis as a message queue within your Python programs." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/python/system/redis-py/build b/packages/python/system/redis-py/build deleted file mode 100755 index 3a7c2afbd8..0000000000 --- a/packages/python/system/redis-py/build +++ /dev/null @@ -1,30 +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 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile bdist_egg --exclude-source-files diff --git a/packages/python/system/redis-py/install b/packages/python/system/redis-py/install deleted file mode 100755 index d2be73015e..0000000000 --- a/packages/python/system/redis-py/install +++ /dev/null @@ -1,30 +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 - -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg diff --git a/packages/python/system/yenc/build b/packages/python/system/yenc/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/system/yenc/build +++ b/packages/python/system/yenc/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/system/yenc/install b/packages/python/system/yenc/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/system/yenc/install +++ b/packages/python/system/yenc/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/sysutils/redis/init.d/58_redis b/packages/sysutils/redis/init.d/58_redis deleted file mode 100644 index 2f4e8de0a4..0000000000 --- a/packages/sysutils/redis/init.d/58_redis +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.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 -################################################################################ - -# Starting Redis Server -# -# runlevels: openelec, textmode - -( - wait_for_network - - progress "starting Redis server" - /usr/sbin/redis-server /etc/redis.conf -)& diff --git a/packages/sysutils/redis/install b/packages/sysutils/redis/install deleted file mode 100755 index 97203fe750..0000000000 --- a/packages/sysutils/redis/install +++ /dev/null @@ -1,33 +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/etc - cp -P $PKG_BUILD/redis.conf $INSTALL/etc - -mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/src/redis-cli $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/src/redis-server $INSTALL/usr/sbin - diff --git a/packages/sysutils/redis/meta b/packages/sysutils/redis/meta deleted file mode 100644 index e31d42bdd4..0000000000 --- a/packages/sysutils/redis/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="redis" -PKG_VERSION="2.2.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OpenSource" -PKG_SITE="http://www.redis.io" -PKG_URL="http://redis.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="sysutils" -PKG_SHORTDESC="redis: an open source, advanced key-value store" -PKG_LONGDESC="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/meta index 3d9e780cd0..50afb775b5 100644 --- a/packages/x11/lib/libXi/meta +++ b/packages/x11/lib/libXi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libXi" -PKG_VERSION="1.4.2" +PKG_VERSION="1.4.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/x11/proto/inputproto/meta b/packages/x11/proto/inputproto/meta index 9aa25ce212..9e34f71c45 100644 --- a/packages/x11/proto/inputproto/meta +++ b/packages/x11/proto/inputproto/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="inputproto" -PKG_VERSION="2.0.1" +PKG_VERSION="2.0.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 4610a4a4ab..b6bc01ab6d 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1026,9 +1026,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 896bae98a4..c2f51c4caa 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1047,9 +1047,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 317c99b297..726e3b936e 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1188,9 +1188,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 75779ee073..1c8919ee50 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1092,9 +1092,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 2c426d10df..5a3114e498 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39 Kernel Configuration +# Linux/x86_64 2.6.39.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1041,9 +1041,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 2d7be17e9f..1c1ff31f17 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1106,9 +1106,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 1595a8d427..a6dcce30f2 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39 Kernel Configuration +# Linux/x86_64 2.6.39.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1056,9 +1056,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set #