Merge remote-tracking branch 'upstream/master' into openelec-settings

2025-07-29 13:46:49 +00:00 · 2013-03-06 13:19:49 +02:00 · 2013-03-06 13:19:49 +02:00 · d1ccd21e5f
commit d1ccd21e5f
parent c1e0d264fd 9bf0c62589
16 changed files with 137 additions and 74 deletions
--- a/packages/3rdparty/download/SABnzbd/meta
+++ b/packages/3rdparty/download/SABnzbd/meta
@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
 PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${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_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline configobj"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/addon
@ -34,6 +34,7 @@ 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
+  cp -R $BUILD/configobj*/.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
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py
@ -27,7 +27,7 @@ import signal
 import subprocess
 import urllib2
 import hashlib
-from configobj import ConfigObj
+import sys
 from xml.dom.minidom import parseString
 import logging
 import traceback
@ -195,6 +195,9 @@ except:

 signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib
+sys.path.append(pPylib)
+
+from configobj import ConfigObj

 # SABnzbd start
 try:
--- a/packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf
+++ b/packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf
@ -209,7 +209,7 @@ CONFIG_CP=y
 # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
 # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
 # CONFIG_FEATURE_DD_IBS_OBS is not set
-# CONFIG_DF is not set
+CONFIG_DF=y
 # CONFIG_FEATURE_DF_FANCY is not set
 # CONFIG_DIRNAME is not set
 # CONFIG_DOS2UNIX is not set
@ -273,7 +273,7 @@ CONFIG_SLEEP=y
 # CONFIG_FEATURE_SORT_BIG is not set
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
-# CONFIG_STAT is not set
+CONFIG_STAT=y
 # CONFIG_FEATURE_STAT_FORMAT is not set
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@ -39,8 +39,10 @@
  REBOOT="0"
  MD5_FAILED="0"
  MD5_NOCHECK="0"
+  SIZE_FAILED="0"

  NBD_DEVS="0"
+  FLASH_FREE_MIN="5"

  INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
  SYSTEM_TORAM_LIMIT=1024000
@ -444,21 +446,53 @@
        MD5_FAILED="1"
      fi

-      # update if md5 check is ok or .nocheck exists
-      if [ "$MD5_FAILED" -eq "0" -o "$MD5_NOCHECK" -eq "1" ] ; then
-        update "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL"
-        update "System" "$UPDATE_SYSTEM" "/flash/$IMAGE_SYSTEM"
-        update_bootloader
-        REBOOT="1"
+      # get sizes
+      FLASH_FREE=$(/bin/busybox df /flash/ | awk '/[0-9]%/{print $4}')
+      FLASH_FREE=$(( $FLASH_FREE * 1024 ))
+      OLD_KERNEL=$(/bin/busybox stat -t "/flash/$IMAGE_KERNEL" | awk '{print $2}')
+      OLD_SYSTEM=$(/bin/busybox stat -t "/flash/$IMAGE_SYSTEM" | awk '{print $2}')
+      NEW_KERNEL=$(/bin/busybox stat -t "$UPDATE_DIR/$UPDATE_KERNEL" | awk '{print $2}')
+      NEW_SYSTEM=$(/bin/busybox stat -t "$UPDATE_DIR/$UPDATE_SYSTEM" | awk '{print $2}')
+
+      # old KERNEL+SYSTEM+free space - new KERNEL+SYSTEM must be higher then 5MB
+      # at least 5MB free after update
+
+      TMP_SIZE=$(($OLD_KERNEL+$OLD_SYSTEM+$FLASH_FREE-$NEW_KERNEL-$NEW_SYSTEM))
+      FLASH_FREE_MIN=$(($FLASH_FREE_MIN*1024*1024))
+
+      if [ $TMP_SIZE -ge $FLASH_FREE_MIN ]; then
+        echo "Checking size: OK"
+      else
+        echo "Checking size: FAILED"
+        SIZE_FAILED="1"
+      fi
+
+      # update if size check is ok
+      if [ "$SIZE_FAILED" -eq "0" ] ; then
+        # update if md5 check is ok or .nocheck exists
+        if [ "$MD5_FAILED" -eq "0" -o "$MD5_NOCHECK" -eq "1" ] ; then
+          update "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL"
+          update "System" "$UPDATE_SYSTEM" "/flash/$IMAGE_SYSTEM"
+          update_bootloader
+          REBOOT="1"
+        else
+          /bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL"
+          /bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM"
+          echo "md5 check failed. normal startup in 30s..."
+          /bin/busybox sync
+        /bin/busybox usleep 30000000
+        fi
+        /bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
+        /bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
      else
        /bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL"
        /bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM"
-        echo "md5 check failed. normal startup in 30s..."
+        /bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
+        /bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
+        echo "size check failed. normal startup in 30s..."
        /bin/busybox sync
        /bin/busybox usleep 30000000
      fi
-      /bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
-      /bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
    fi

    if test "$REBOOT" -eq "1"; then
--- a/packages/mediacenter/xbmc/scripts/gputemp
+++ b/packages/mediacenter/xbmc/scripts/gputemp
@ -27,11 +27,13 @@ if lspci -n | grep 0300 | grep -q 10de; then
 fi

 if lspci -n | grep 0300 | grep -q 1002; then
-	if [ -f /storage/.config/xorg.conf ]; then
-		XORG="/storage/.config/xorg.conf"
-	else
-		XORG="/etc/X11/xorg-fglrx.conf"
-	fi
+  if [ -f /storage/.config/xorg.conf ]; then
+    XORG="/storage/.config/xorg.conf"
+  elif [ -f /etc/X11/xorg-fglrx-legacy.conf ]; then
+    XORG="/etc/X11/xorg-fglrx-legacy.conf"
+  else
+    XORG="/etc/X11/xorg-fglrx.conf"
+  fi
  [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
 fi

--- a/packages/python/devel/Cheetah/build
+++ b/packages/python/devel/Cheetah/build
@ -31,3 +31,4 @@ python setup.py build --cross-compile
 python setup.py install --root=./.install --prefix=/usr

 rm -rf .install/usr/bin
+find .install/usr/lib/python*/site-packages/  -name "*.py" -exec rm -rf {} ";"
--- a/packages/python/system/yenc/build
+++ b/packages/python/system/yenc/build
@ -31,3 +31,4 @@ python setup.py build --cross-compile
 python setup.py install --root=./.install --prefix=/usr

 rm -rf .install/usr/bin
+rm -rf .install/usr/lib/python*/site-packages/*.py
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@ -40,6 +40,8 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
    cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
    cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/
    ln -sf /bin/busybox $INSTALL/usr/bin/env          #/usr/bin/env is needed for most python scripts
+    cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/
+    ln -sf pastebinit $INSTALL/usr/bin/paste

  mkdir -p $INSTALL/sbin
    cp $PKG_DIR/scripts/init $INSTALL/sbin/
--- a/packages/sysutils/busybox/meta
+++ b/packages/sysutils/busybox/meta
@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="bash kexec-tools hdparm speedcontrol pastebinit zip pciutils usbutils"
+PKG_DEPENDS="bash kexec-tools hdparm speedcontrol zip pciutils usbutils"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"
--- a/packages/sysutils/busybox/scripts/pastebinit
+++ b/packages/sysutils/busybox/scripts/pastebinit
@ -20,11 +20,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-. config/options $1
+#
+# wrapper for curl, posting to the sprunge.us pastebin
+# reads from stdin if called without an argument
+#

-mkdir -p $INSTALL/etc/pastebin.d
-  cp $PKG_BUILD/pastebin.d/sprunge.us.conf $INSTALL/etc/pastebin.d
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/pastebinit $INSTALL/usr/bin
-  ln -sf pastebinit $INSTALL/usr/bin/paste      # link for a shorter command
+cat "$@" | curl -F 'sprunge=<-' http://sprunge.us
--- a/packages/tools/pastebinit/meta
+++ b/packages/tools/pastebinit/meta
@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pastebinit"
-PKG_VERSION="1.3.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://launchpad.net/pastebinit"
-PKG_URL="http://launchpad.net/pastebinit/trunk/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python simplejson configobj"
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="tools"
-PKG_SHORTDESC="pastebinit: Upload Directly to Pastebin from the Linux Shell"
-PKG_LONGDESC="pastebinit is a tool for Uploading Directly to Pastebin from the Linux Shell"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
--- a/packages/tools/pastebinit/patches/pastebinit-1.3.1-01-change_default_pastebin.patch
+++ b/packages/tools/pastebinit/patches/pastebinit-1.3.1-01-change_default_pastebin.patch
@ -1,12 +0,0 @@
-diff -Naur pastebinit-1.3/pastebinit pastebinit-1.3.patch/pastebinit
--- pastebinit-1.3/pastebinit	2012-02-15 22:14:22.000000000 +0100
-+++ pastebinit-1.3.patch/pastebinit	2012-05-07 03:40:49.119612858 +0200
-@@ -17,7 +17,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
-defaultPB = "http://pastebin.com" #Default pastebin
-+defaultPB = "http://sprunge.us" #Default pastebin
- try:
-     import lsb_release
-     release = lsb_release.get_distro_information()['ID'].lower()
--- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch
+++ b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch
@ -0,0 +1,20 @@
+diff --git a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+index b358d0b..d45a78a 100755
+--- a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+++ b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+@@ -97,7 +97,6 @@
+     FGL_ASIC_ID(0x677B),
+     FGL_ASIC_ID(0x6772),
+     FGL_ASIC_ID(0x6779),
+-    FGL_ASIC_ID(0x6770),
+     FGL_ASIC_ID(0x671F),
+     FGL_ASIC_ID(0x6718),
+     FGL_ASIC_ID(0x6719),
+@@ -147,7 +146,6 @@
+     FGL_ASIC_ID(0x68D1),
+     FGL_ASIC_ID(0x68C7),
+     FGL_ASIC_ID(0x68E0),
+-    FGL_ASIC_ID(0x68E1),
+     FGL_ASIC_ID(0x68F0),
+     FGL_ASIC_ID(0x68F1),
+     FGL_ASIC_ID(0x68E4),
--- a/projects/ARCTIC_MC/xbmc/advancedsettings.xml
+++ b/projects/ARCTIC_MC/xbmc/advancedsettings.xml
@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<advancedsettings>
+  <showexitbutton>false</showexitbutton>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
+  <video>
+    <latency>
+      <delay>0</delay>
+      <refresh>
+        <min>23</min>
+        <max>24</max>
+        <delay>175</delay>
+      </refresh>
+    </latency>
+  </video>
+  <samba>
+    <clienttimeout>30</clienttimeout>
+  </samba>
+  <network>
+    <curlclienttimeout>30</curlclienttimeout>
+  </network>
+<!-- audio workaround for fusion -->
+  <audiooutput>
+    <dtshdpassthrough>false</dtshdpassthrough>
+    <multichannellpcm>false</multichannellpcm>
+    <passthroughaac>false</passthroughaac>
+    <stereoupmix>false</stereoupmix>
+    <truehdpassthrough>false</truehdpassthrough>
+  </audiooutput>
+</advancedsettings>
--- a/projects/Fusion/xbmc/advancedsettings.xml
+++ b/projects/Fusion/xbmc/advancedsettings.xml
@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
+  <showexitbutton>false</showexitbutton>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
+  <video>
+    <latency>
+      <delay>0</delay>
+      <refresh>
+        <min>23</min>
+        <max>24</max>
+        <delay>175</delay>
+      </refresh>
+    </latency>
+  </video>
+  <samba>
+    <clienttimeout>30</clienttimeout>
+  </samba>
+  <network>
+    <curlclienttimeout>30</curlclienttimeout>
+  </network>
 <!-- audio workaround for fusion -->
  <audiooutput>
    <dtshdpassthrough>false</dtshdpassthrough>