Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-09-18 19:41:59 +02:00
commit a664ce5335
2 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="service.openelec.settings" PKG_NAME="service.openelec.settings"
PKG_VERSION="0.2.13" PKG_VERSION="0.2.14"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="prop." PKG_LICENSE="prop."

View File

@ -27,10 +27,10 @@
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update bootloader files # update bootloader files
cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
# cleanup not more needed files # cleanup not more needed files
rm -rf $BOOT_ROOT/loader.bin rm -rf $BOOT_ROOT/loader.bin
@ -39,7 +39,7 @@
# some config.txt magic # some config.txt magic
if [ ! -f $BOOT_ROOT/config.txt ]; then if [ ! -f $BOOT_ROOT/config.txt ]; then
cp $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then
mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk
cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \ cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \