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

This commit is contained in:
Stephan Raue 2011-10-22 02:09:15 +02:00
commit f795eccaa2
45 changed files with 301 additions and 52 deletions

View File

@ -0,0 +1,7 @@
OpenELEC - 1.0.1 (21.10.2011)
- dont start wpa_supplicant in debugmode, this fixes non working wlan connections
- update DVB firmwares
OpenELEC - 1.0.0 (20.10.2011)
- initial version

View File

@ -1 +1 @@
devel
1.0.1

View File

@ -0,0 +1,29 @@
#!/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 $ADDON_BUILD/$PKG_ADDON_ID
cp -PR $PKG_BUILD/addons/pvr.vdr.xvdr/resources $ADDON_BUILD/$PKG_ADDON_ID
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $ADDON_BUILD/$PKG_ADDON_ID
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $ADDON_BUILD/$PKG_ADDON_ID

View File

@ -0,0 +1,38 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
# some fixes for autoreconf
touch NEWS AUTHORS ChangeLog
do_autoreconf
CXXFLAGS="-DZLIB_INTERNAL=1" \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
--enable-shared
make

View File

@ -0,0 +1,2 @@
1.0.0
- initial import of xbmc-addon-xvdr-9822a8a

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,29 @@
#!/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/usr/share/xbmc/addons/pvr.vdr.xvdr
cp -PRf $PKG_BUILD/addons/pvr.vdr.xvdr/resources $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
# cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr

View File

@ -0,0 +1,37 @@
################################################################################
# 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="xbmc-addon-xvdr"
PKG_VERSION="9822a8a"
PKG_REV="0"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr"
PKG_URL="http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/xbmc-addon-xvdr-$PKG_VERSION.tar.gz"
PKG_DEPENDS="zlib"
PKG_BUILD_DEPENDS="toolchain zlib"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia/pvr"
PKG_SHORTDESC="XVDR addon for XBMC"
PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.python.script"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,23 @@
################################################################################
# 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
################################################################################
import os
import sys
import xbmcaddon

View File

@ -1,3 +1,6 @@
1.0.2
- add (CH) GA Weissenstein default muxes
1.0.1
- add XMLTV tv_file_grab support
- add XMLTV configuration support

View File

@ -20,7 +20,7 @@
PKG_NAME="hts-tvheadend"
PKG_VERSION="c88a646"
PKG_REV="0"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

View File

@ -0,0 +1,55 @@
diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
--- hts-tvheadend-c88a646/src/linuxtv_muxes.h 2011-09-26 20:18:12.000000000 +0200
+++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h 2011-10-18 13:40:37.768853992 +0200
@@ -12001,6 +12001,39 @@
{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
};
+static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
+ { .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+ { .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
+};
+
static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
@@ -12881,6 +12914,11 @@
static const struct network networks_DVBC_ch[] = {
{
+ .name = "GA-Weissenstein",
+ .muxes = muxes_DVBC_ch_GA_Weissenstein,
+ .nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
+ },
+ {
.name = "Rega-Sense",
.muxes = muxes_DVBC_ch_Rega_Sense,
.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.13"
PKG_VERSION="0.0.15"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux"
PKG_VERSION="3.1-rc9"
PKG_VERSION="3.1-rc10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -36,6 +36,16 @@ fi
# hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
# hack to support user installed fonts
SUBFONTS="/storage/.xbmc/userdata/fonts"
if [ -d "$SUBFONTS" ]; then
files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
if [ "$files" = "0" ]; then
cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
fi
mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
fi
# starting autostart script (will be removed later again, dont use it!!!)
AUTOSTART="/storage/.config/autostart.sh"
if [ -f $AUTOSTART ]; then

View File

@ -24,7 +24,7 @@
case "$1" in
thaw|resume)
xbmc-send --host=127.0.0.1 -a "ReloadSkin()"
xbmc-send --host=127.0.0.1 -a "ReloadSkin()" &
;;
*) exit $NA
;;

View File

@ -23,7 +23,7 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/fuse/afpfs $INSTALL/usr/bin

View File

@ -34,17 +34,17 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/lib/udev
cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
chmod +x $INSTALL/lib/udev/bluetooth_serial
# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
# not needed: chmod +x $INSTALL/lib/udev/bluetooth_serial
cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/alsa
cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa

View File

@ -1,18 +0,0 @@
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 17:43:39.000000000 +0200
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-04-08 19:04:10.740611827 +0200
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
User=root
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2010-09-07 17:43:39.000000000 +0200
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-04-08 19:04:18.365451110 +0200
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
User=root

View File

@ -37,5 +37,3 @@ cd $PKG_BUILD
make
$MAKEINSTALL
python -Wi -t $PYTHON_LIBDIR/compileall.py .

View File

@ -29,25 +29,20 @@ mkdir -p $INSTALL/usr/lib
mkdir -p $PYTHON_LIB_DIR/site-packages
cp $PKG_BUILD/pygtk.py $PYTHON_LIB_DIR/site-packages
cp $PKG_BUILD/pygtk.pyc $PYTHON_LIB_DIR/site-packages
echo "gtk-2.0" > $PYTHON_LIB_DIR/site-packages/pygtk.pth
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0
cp $PKG_BUILD/dsextras.py $PYTHON_LIB_DIR/site-packages/gtk-2.0
cp $PKG_BUILD/dsextras.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
cp $PKG_BUILD/gobject/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
cp $PKG_BUILD/gobject/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
cp $PKG_BUILD/glib/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
cp $PKG_BUILD/glib/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
cp $PKG_BUILD/gio/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio

View File

@ -35,5 +35,3 @@ cd $PKG_BUILD
make
$MAKEINSTALL
python -Wi -t $PYTHON_LIBDIR/compileall.py .

View File

@ -27,10 +27,10 @@ PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*`
mkdir -p $PYTHON_LIB_DIR/site-packages
cp -P $PKG_BUILD/_dbus_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages
cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages
cp $PKG_BUILD/*.pyc $PYTHON_LIB_DIR/site-packages
cp $PKG_BUILD/*.py $PYTHON_LIB_DIR/site-packages
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus
cp $PKG_BUILD/dbus/*.pyc $PYTHON_LIB_DIR/site-packages/dbus
cp $PKG_BUILD/dbus/*.py $PYTHON_LIB_DIR/site-packages/dbus
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop
cp $PKG_BUILD/dbus/mainloop/*.pyc $PYTHON_LIB_DIR/site-packages/dbus/mainloop
cp $PKG_BUILD/dbus/mainloop/*.py $PYTHON_LIB_DIR/site-packages/dbus/mainloop

View File

@ -0,0 +1,38 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# Attempts to generate a unique system ID based on one local MAC address
# SystemID SHOULD be the same between upgrades/reinstalls
# MAC is hashed so that it cant be reversed making it anonymous
# Used to help with global usage statistics
################################################################################
SYSTEMID="00000000000000000000000000000000"
if [ -e "/sys/class/net/eth0/address" ]; then
MAC_ADRESS=`cat /sys/class/net/eth0/address`
elif [ -e "/sys/class/net/wlan0/address" ]; then
MAC_ADRESS=`cat /sys/class/net/wlan0/address`
fi
if [ -n "$MAC_ADRESS" ]; then
SYSTEMID=`/bin/echo $MAC_ADRESS | /usr/bin/md5sum | /usr/bin/cut -f1 -d" "`
fi
export SYSTEMID

View File

@ -1 +1 @@
SUSPEND_MODULES="xhci-hcd jme anysee"
SUSPEND_MODULES="xhci-hcd jme anysee rtl8192se"

View File

@ -43,7 +43,9 @@ fi
download () {
case "$DL_METHOD" in
wget)
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
-c ${1}?sysid=$SYSTEMID \
-O $2 > /dev/null 2>&1
;;
scp)
scp $SCP_ARG "$1" $TMP_DIR
@ -69,7 +71,7 @@ if [ ! -f /var/lock/update.lock ]; then
# get infofile with the latest released version
rm -rf $TMP_DIR/latest
download "$UPDATEURL/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"`"
@ -79,7 +81,7 @@ if [ ! -f /var/lock/update.lock ]; then
# compare installed version with latest released version
THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
if [ -Z $NEW_VERSION ]; then
if [ -z $NEW_VERSION ]; then
NEW_VERSION="$THIS_VERSION"
fi
@ -100,7 +102,7 @@ if [ ! -f /var/lock/update.lock ]; then
# downloading the new version
rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
download "$UPDATEURL/$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

View File

@ -43,7 +43,9 @@ fi
download () {
case "$DL_METHOD" in
wget)
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
-c ${1}?sysid=$SYSTEMID \
-O $2 > /dev/null 2>&1
;;
scp)
scp $SCP_ARG "$1" $TMP_DIR
@ -72,7 +74,7 @@ if [ ! -f /var/lock/update.lock ]; then
# get infofile with the latest released version
rm -rf $TMP_DIR/latest
download "$UPDATEURL/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`"
@ -116,7 +118,7 @@ if [ ! -f /var/lock/update.lock ]; then
# downloading the new version
rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
download "$UPDATEURL/$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

View File

@ -53,7 +53,8 @@ if [ -f $PKG_DIR/addon ]; then
$PKG_DIR/addon $@ >&$VERBOSE_OUT
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-e "s|@PKG_NAME@|$PKG_NAME|g" \
-e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \
@ -63,12 +64,12 @@ if [ -f $PKG_DIR/addon ]; then
-e "s|@OS_VERSION@|$OS_VERSION|g" \
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
fi
if [ -f $PKG_DIR/source/default.py ]; then
cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
else
echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***"
exit 1
echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
fi
if [ -f $PKG_DIR/icon/icon.png ]; then