diff --git a/config/functions b/config/functions index 70a4547898..509c6ea7d7 100644 --- a/config/functions +++ b/config/functions @@ -341,7 +341,6 @@ if [ "$BOOTLOADER" = "u-boot" ]; then fi config_message="$config_message\n - UDisks support:\t\t\t $UDISKS" config_message="$config_message\n - UPower support:\t\t\t $UPOWER" - config_message="$config_message\n - Update support:\t\t\t $UPDATE_SUPPORT" config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT" # Misc. Filesystems diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt index 96b75f4a3e..8072097a8b 100644 --- a/packages/addons/service/multimedia/boblightd/changelog.txt +++ b/packages/addons/service/multimedia/boblightd/changelog.txt @@ -1,3 +1,6 @@ +3.0.4 +- update to boblightd-467 + 3.0.3 - update to boblightd-465 diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index 00d3dec056..6bf262c928 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="boblightd" -PKG_VERSION="465" -PKG_REV="3" +PKG_VERSION="467" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index 6c42fbd577..5e02584c0d 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,3 +1,6 @@ +3.0.10 (in progress) +- added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL + 3.0.9 - update to TVHeadend 3.4 diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file index c4116042b9..580a3009f3 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file @@ -27,6 +27,7 @@ ADDON_SETTINGS="$ADDON_HOME/settings.xml" XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` dflag= vflag= @@ -36,6 +37,10 @@ if [[ $# -lt 1 ]]; then if [ "$XMLTV_TYPE" = "FILE" ]; then cat "$XMLTV_LOCATION_FILE" exit 0 + elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then + if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then + exec "$XMLTV_LOCATION_SCRIPT" + fi elif [ "$XMLTV_TYPE" = "WEB" ]; then wget -qO - "$XMLTV_LOCATION_WEB" exit 0 diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml index 3c90281869..93ce0233aa 100644 --- a/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml @@ -8,6 +8,7 @@ XMLTV source type XMLTV File location XMLTV Web location + XMLTV Script location DVB Configuration Unload DVB mudules before suspend Wait for frontend initialization diff --git a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml index dcc5a1b567..b1071e5f60 100644 --- a/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml +++ b/packages/addons/service/multimedia/tvheadend/source/resources/settings.xml @@ -5,9 +5,10 @@ - + - + + diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index f2fb5bcd65..9cf2998d22 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -42,8 +42,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv - cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/ +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/ + cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-[0-9]*/.install/usr/lib/vdr/libvdr-dvbhddevice.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 64164390d2..94d2624b81 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,9 @@ +3.0.7 (in progress) +- update to vdr-plugin-xmltv2vdr-30903cc0 +- cleanup epgsources handling +- * support for multiple epgsources +- * support user defined epgsources + 3.0.6 - fix startup error in vnsiserver / 32bit diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index ab73e25564..8b2ae20244 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -16,6 +16,7 @@ + diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 8c0a7d8188..01a3b9e3da 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -46,8 +46,18 @@ fi mkdir -p /var/config cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf + +#handle epgsources mkdir -p /var/lib/epgsources -cp $ADDON_DIR/config/epgsources/epgdata2xmltv/epgdata2xmltv.dist /var/lib/epgsources/epgdata2xmltv +mkdir -p $ADDON_HOME/config/epgsources +for source in `find $ADDON_DIR/config/epgsources -type f`; do + if [ ! -e $ADDON_HOME/config/epgsources/`basename $source` ] ; then + cp $source $ADDON_HOME/config/epgsources/ + fi +done +for source in `find $ADDON_HOME/config/epgsources -type f`; do + cp $source /var/lib/epgsources +done . /var/config/vdr.conf.default . /var/config/vdr.conf diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index 7a7c321b5d..8a11574686 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -22,8 +22,6 @@ control: listen on port Enable plugin: epgsearch Enable plugin: xmltv2vdr - Enable epgdata.com - epgdata.com PIN VDR Configuration VDR Video Dir PVR plugin diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 047698eab4..36020ce737 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -28,8 +28,6 @@ - - diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 3eb224fb4a..2928e9d4b0 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="8568" -PKG_REV="9" +PKG_VERSION="8636" +PKG_REV="10" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki" diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 936604ce98..51ba5d0844 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -46,9 +46,6 @@ fi sh $AUTOSTART fi -# starting autoupdate - [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate & - # waiting for Xorg to start wait_for_xorg diff --git a/packages/network/connman/build b/packages/network/connman/build index 5b3d64b059..a54a88d0cc 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -69,6 +69,7 @@ cd $PKG_BUILD --disable-ofono \ --disable-dundee \ --disable-pacrunner \ + --disable-neard \ --disable-wispr \ --disable-tools \ --enable-client \ diff --git a/packages/network/connman/meta b/packages/network/connman/meta index d897285312..a76fe681d2 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="a5a030e" +PKG_VERSION="1aa44c8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/init.d/23_syslogd b/packages/sysutils/busybox/init.d/23_syslogd index 17a48f1d4a..3f391ff877 100644 --- a/packages/sysutils/busybox/init.d/23_syslogd +++ b/packages/sysutils/busybox/init.d/23_syslogd @@ -42,7 +42,9 @@ syslogd $SYSLOGD_OPTIONS - sleep 3 + if [ "$SYSLOG_REMOTE" == "true" -a "$SYSLOG_SERVER" ]; then + sleep 3 + fi progress "Starting Kernellog daemon" klogd diff --git a/packages/tools/autoupdate/config/repo.conf.devel b/packages/tools/autoupdate/config/repo.conf.devel deleted file mode 100644 index 5385b59994..0000000000 --- a/packages/tools/autoupdate/config/repo.conf.devel +++ /dev/null @@ -1,27 +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 -################################################################################ -# Location of repo - UPDATEURL="http://snapshots.openelec.tv" - -# Setup Download tool (wget/scp) - DL_METHOD="wget" - -# Keyfile to use (with scp method) - KEYFILE="" diff --git a/packages/tools/autoupdate/config/repo.conf.release b/packages/tools/autoupdate/config/repo.conf.release deleted file mode 100644 index 8e6b7f2a49..0000000000 --- a/packages/tools/autoupdate/config/repo.conf.release +++ /dev/null @@ -1,27 +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 -################################################################################ -# Location of repo - UPDATEURL="http://releases.openelec.tv" - -# Setup Download tool (wget/scp) - DL_METHOD="wget" - -# Keyfile to use (with scp method) - KEYFILE="" diff --git a/packages/tools/autoupdate/install b/packages/tools/autoupdate/install deleted file mode 100755 index 7804a3b777..0000000000 --- a/packages/tools/autoupdate/install +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -################################################################################ -# 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 -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin - if [ "$OPENELEC_VERSION" = devel ]; then - cp $PKG_DIR/scripts/autoupdate.devel $INSTALL/usr/bin/autoupdate - else - cp $PKG_DIR/scripts/autoupdate.release $INSTALL/usr/bin/autoupdate - fi - -mkdir -p $INSTALL/etc - if [ -f $PROJECT_DIR/$PROJECT/autoupdate/repo.conf ]; then - cp $PROJECT_DIR/$PROJECT/autoupdate/repo.conf $INSTALL/etc - else - if [ "$OPENELEC_VERSION" = devel ]; then - cp $PKG_DIR/config/repo.conf.devel $INSTALL/etc/repo.conf - else - cp $PKG_DIR/config/repo.conf.release $INSTALL/etc/repo.conf - fi - fi - - if [ -f $PROJECT_DIR/$PROJECT/autoupdate/update.key.db ]; then - cp $PROJECT_DIR/$PROJECT/autoupdate/update.key.db $INSTALL/etc - fi - - if [ -f $PROJECT_DIR/$PROJECT/autoupdate/update.conf ]; then - cp $PROJECT_DIR/$PROJECT/autoupdate/update.conf $INSTALL/etc - fi - -mkdir -p $INSTALL/etc/pm/sleep.d - cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d diff --git a/packages/tools/autoupdate/meta b/packages/tools/autoupdate/meta deleted file mode 100644 index 20aa2d8e70..0000000000 --- a/packages/tools/autoupdate/meta +++ /dev/null @@ -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="autoupdate" -PKG_VERSION="0.2.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.openelec.tv" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="tools" -PKG_SHORTDESC="autoupdate: an simple automatic update script" -PKG_LONGDESC="autoupdate: an simple automatic update script." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel deleted file mode 100755 index 314dd84565..0000000000 --- a/packages/tools/autoupdate/scripts/autoupdate.devel +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh - -################################################################################ -# 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 -################################################################################ - -TMP_DIR="$HOME/.xbmc/temp" - -if [ -f /etc/update.conf ]; then - . /etc/update.conf -elif [ -f /storage/.cache/openelec/update.conf ]; then - . /storage/.cache/openelec/update.conf - AUTOUPDATE="$UPDATE_AUTO" -else - exit 0 -fi - -if [ -f /etc/repo.conf ]; then - . /etc/repo.conf - if [ -n "$KEYFILE" ]; then - SCP_ARG="-i $KEYFILE" - fi -else - exit 0 -fi - -download () { - case "$DL_METHOD" in - wget) - wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \ - -c ${1}?sysid=$SYSTEMID \ - -O $2 > /dev/null 2>&1 - [ $? -ne 0 ] && exit 1 - ;; - scp) - scp $SCP_ARG "$1" $TMP_DIR - ;; - esac -} - -send_message () { - xbmc-send --host=127.0.0.1 -a "Notification(Automatic update service:,$1,20000)" -} - -if [ ! -f /var/lock/update.lock ]; then - - if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" -o "$AUTOUPDATE" = "auto" ]; then - - # sleep a bit, maybe we have a lot of work ;-) - usleep 30000000 - - # getting this version - THIS_DISTRIBUTION="`cat /etc/distribution`" - THIS_ARCH="`cat /etc/arch`" - THIS_VERSION="`cat /etc/version`" - - # get infofile with the latest released version - rm -rf $TMP_DIR/latest - download "$UPDATEURL/latest" "$TMP_DIR/latest" - - NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`" - NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`" - - rm -rf $TMP_DIR/latest - - # compare installed version with latest released version - THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`" - - if [ -z $NEW_VERSION ]; then - NEW_VERSION="$THIS_VERSION" - fi - - if [ "$THIS_VERSION" -lt "$NEW_VERSION" ]; then - - if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then - - # show a message if a new version is avaible - send_message "New update avaible: r$NEW_VERSION - please update manually" - - elif [ "$AUTOUPDATE" = "auto" ]; then - - # show a message if a new version is avaible - send_message "New update avaible: r$NEW_VERSION - downloading and extracting the new version..." - - # locking autoupdate - touch /var/lock/update.lock - - # downloading the new version - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2" - - # extract the image - rm -rf $TMP_DIR/$NEW_IMAGE - tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR - - # move KERNEL and SYSTEM to an temporary file - mkdir -p /storage/.update - if [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL -a -f $TMP_DIR/$NEW_IMAGE/target/KERNEL.md5 ]; then - mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp - mv $TMP_DIR/$NEW_IMAGE/target/KERNEL.md5 /storage/.update/KERNEL.md5.tmp - fi - if [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM -a -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM.md5 ]; then - mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp - mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM.md5 /storage/.update/SYSTEM.md5.tmp - fi - sync - - # move KERNEL and SYSTEM to the right place - mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL - mv /storage/.update/KERNEL.md5.tmp /storage/.update/KERNEL.md5 - mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM - mv /storage/.update/SYSTEM.md5.tmp /storage/.update/SYSTEM.md5 - sync - - # cleanup tmp files - rm -rf $TMP_DIR/$NEW_IMAGE - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - rm -rf /storage/.update/*.tmp - - # we are ready (hopefully) - send_message "Update r$NEW_VERSION - downloaded and extracted - please reboot to install" - - fi - fi - fi -fi diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release deleted file mode 100755 index 83e4aa7fe8..0000000000 --- a/packages/tools/autoupdate/scripts/autoupdate.release +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/sh - -################################################################################ -# 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 -################################################################################ - -TMP_DIR="$HOME/.xbmc/temp" - -if [ -f /etc/update.conf ]; then - . /etc/update.conf -elif [ -f /storage/.cache/openelec/update.conf ]; then - . /storage/.cache/openelec/update.conf - AUTOUPDATE="$UPDATE_AUTO" -else - exit 0 -fi - -if [ -f /etc/repo.conf ]; then - . /etc/repo.conf - if [ -n "$KEYFILE" ]; then - SCP_ARG="-i $KEYFILE" - fi -else - exit 0 -fi - -download () { - case "$DL_METHOD" in - wget) - wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \ - -c ${1}?sysid=$SYSTEMID \ - -O $2 > /dev/null 2>&1 - [ $? -ne 0 ] && exit 1 - ;; - scp) - scp $SCP_ARG "$1" $TMP_DIR - ;; - esac -} - -send_message () { - xbmc-send --host=127.0.0.1 -a "Notification(Automatic update service:,$1,20000)" -} - -if [ ! -f /var/lock/update.lock ]; then - - if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" -o "$AUTOUPDATE" = "auto" ]; then - - # sleep a bit, maybe we have a lot of work ;-) - usleep 30000000 - - # getting this version - THIS_DISTRIBUTION="`cat /etc/distribution`" - THIS_ARCH="`cat /etc/arch`" - THIS_VERSION="`cat /etc/version`" - THIS_MAJOR="`echo "$THIS_VERSION" | cut -d "." -f1`" - THIS_MINOR="`echo "$THIS_VERSION" | cut -d "." -f2`" - THIS_PATCH="`echo "$THIS_VERSION" | cut -d "." -f3`" - - # get infofile with the latest released version - rm -rf $TMP_DIR/latest - download "$UPDATEURL/latest" "$TMP_DIR/latest" - - NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`" - NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`" - - rm -rf $TMP_DIR/latest - - # compare installed version with latest released version - NEW_MAJOR="`echo "$NEW_VERSION" | cut -d "." -f1`" - NEW_MINOR="`echo "$NEW_VERSION" | cut -d "." -f2`" - NEW_PATCH="`echo "$NEW_VERSION" | cut -d "." -f3`" - - if [ "$THIS_PATCH" -lt "$NEW_PATCH" -a \ - "$THIS_MINOR" -eq "$NEW_MINOR" -a \ - "$THIS_MAJOR" -eq "$NEW_MAJOR" ] || \ - [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \ - "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \ - "$NEW_MINOR" -lt 90 ] || \ - [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \ - "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \ - "$THIS_MINOR" -ge 90 -a \ - "$NEW_MINOR" -ge 90 ] || \ - [ "$THIS_MINOR" -ge 90 -a \ - "$NEW_MINOR" -lt 90 -a \ - $(( $THIS_MAJOR + 1 )) -eq "$NEW_MAJOR" ]; then - AUTOUPDATE="$AUTOUPDATE" - elif [ "$THIS_MAJOR" -lt "$NEW_MAJOR" -a \ - "$NEW_MINOR" -lt 90 ]; then - AUTOUPDATE="manually" - else - AUTOUPDATE="no" - fi - - if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then - - # show a message if a new version is available - send_message "New update available: $NEW_VERSION - please update manually" - - elif [ "$AUTOUPDATE" = "auto" ]; then - - # show a message if a new version is available - send_message "New update available: $NEW_VERSION - downloading and extracting the new version..." - - # locking autoupdate - touch /var/lock/update.lock - - # downloading the new version - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2" - - # extract the image - rm -rf $TMP_DIR/$NEW_IMAGE - tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR - - # move KERNEL and SYSTEM to an temporary file - mkdir -p /storage/.update - if [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL -a -f $TMP_DIR/$NEW_IMAGE/target/KERNEL.md5 ]; then - mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp - mv $TMP_DIR/$NEW_IMAGE/target/KERNEL.md5 /storage/.update/KERNEL.md5.tmp - fi - if [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM -a -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM.md5 ]; then - mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp - mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM.md5 /storage/.update/SYSTEM.md5.tmp - fi - sync - - # move KERNEL and SYSTEM to the right place - mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL - mv /storage/.update/KERNEL.md5.tmp /storage/.update/KERNEL.md5 - mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM - mv /storage/.update/SYSTEM.md5.tmp /storage/.update/SYSTEM.md5 - sync - - # cleanup tmp files - rm -rf $TMP_DIR/$NEW_IMAGE - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - rm -rf /storage/.update/*.tmp - - # we are ready (hopefully) - send_message "Update $NEW_VERSION - downloaded and extracted - please reboot to install" - - fi - fi -fi diff --git a/packages/tools/autoupdate/sleep.d/90_autoupdate b/packages/tools/autoupdate/sleep.d/90_autoupdate deleted file mode 100755 index 0adc85ff1c..0000000000 --- a/packages/tools/autoupdate/sleep.d/90_autoupdate +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -################################################################################ -# 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 -################################################################################ - -. /etc/profile - -case "$1" in - thaw|resume) - autoupdate & - ;; - *) exit $NA - ;; -esac diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 75c6408839..5f11ca7a16 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 3f699239fe..4ae73a0f83 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -315,9 +315,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index 134cd0e609..48483ba899 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 76b5db5335..ee86a0253b 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index c4fe0dd203..1589766c65 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index 499bdd1954..c146a43a8c 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index a750ad5d35..862af0b6d0 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index b29a476d63..e9d11775e3 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="131072" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="no" diff --git a/projects/Ultra/options b/projects/Ultra/options index 909560775c..e5d518f82e 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -314,9 +314,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 3e7492f276..7ce9543d6f 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -309,9 +309,6 @@ # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="262144" -# build with automatic update support (yes / no) - UPDATE_SUPPORT="yes" - # build with installer (yes / no) INSTALLER_SUPPORT="yes" diff --git a/scripts/image b/scripts/image index 02f7e5b709..f9db2bd16a 100755 --- a/scripts/image +++ b/scripts/image @@ -141,9 +141,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # Sensors support [ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors -# Update support - [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate - # Installer support [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer