From d4275b65d7cb21e8456f0155bf9b6f8b0f4b262d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 22 Mar 2013 18:58:34 +0200 Subject: [PATCH 1/8] fix typo in create_livestick.bat --- packages/tools/syslinux/files/create_livestick.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/syslinux/files/create_livestick.bat b/packages/tools/syslinux/files/create_livestick.bat index 7a78f839f9..517be5dbd4 100755 --- a/packages/tools/syslinux/files/create_livestick.bat +++ b/packages/tools/syslinux/files/create_livestick.bat @@ -97,7 +97,7 @@ IF ERRORLEVEL 1 goto InvalidDrive >NUL copy README.md %DRIVE% >NUL copy RELEASE %DRIVE% >NUL copy openelec.ico %DRIVE% ->NUL copy 3rdparty/syslinux/vesamenu.c32 %DRIVE% +>NUL copy 3rdparty\syslinux\vesamenu.c32 %DRIVE% >NUL copy splash.png %DRIVE% FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G @@ -200,4 +200,4 @@ ECHO. popd SET DRIVE= SET DRIVEUUID= -PAUSE \ No newline at end of file +PAUSE From d1edf6f772ac2563a5393f4fe6cca7d74725d759 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 22 Mar 2013 18:27:29 +0100 Subject: [PATCH 2/8] oeinstaller, create_livestick*: get rid of white screen during boot --- .../tools/syslinux/files/create_livestick | 4 ++-- .../tools/syslinux/files/create_livestick.bat | 4 ++-- .../tools/syslinux/files/create_livestick.exe | Bin 111005 -> 111020 bytes tools/nsis-installer/oeinstaller.nsi | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) mode change 100755 => 100644 packages/tools/syslinux/files/create_livestick.bat mode change 100755 => 100644 packages/tools/syslinux/files/create_livestick.exe mode change 100755 => 100644 tools/nsis-installer/oeinstaller.nsi diff --git a/packages/tools/syslinux/files/create_livestick b/packages/tools/syslinux/files/create_livestick index 000c2ccac0..6029d601fb 100755 --- a/packages/tools/syslinux/files/create_livestick +++ b/packages/tools/syslinux/files/create_livestick @@ -210,12 +210,12 @@ MENU COLOR tabmsg 31;40 #ff868787 #00000000 std LABEL installer MENU LABEL Run OpenELEC Installer KERNEL /KERNEL - APPEND boot=UUID=$UUID installer quiet + APPEND boot=UUID=$UUID installer quiet vga=current LABEL live MENU LABEL Run OpenELEC Live KERNEL /KERNEL - APPEND boot=UUID=$UUID disk=FILE=STORAGE,512 quiet + APPEND boot=UUID=$UUID disk=FILE=STORAGE,512 quiet vga=current EOF diff --git a/packages/tools/syslinux/files/create_livestick.bat b/packages/tools/syslinux/files/create_livestick.bat old mode 100755 new mode 100644 index 517be5dbd4..37521d2cc3 --- a/packages/tools/syslinux/files/create_livestick.bat +++ b/packages/tools/syslinux/files/create_livestick.bat @@ -133,12 +133,12 @@ ECHO. >> %DRIVE%\syslinux.cfg ECHO LABEL installer >> %DRIVE%\syslinux.cfg ECHO MENU LABEL Run OpenELEC Installer >> %DRIVE%\syslinux.cfg ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg -ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg +ECHO APPEND boot=LABEL=OPENELEC installer quiet vga=current >> %DRIVE%\syslinux.cfg ECHO. >> %DRIVE%\syslinux.cfg ECHO LABEL live >> %DRIVE%\syslinux.cfg ECHO MENU LABEL Run OpenELEC Live >> %DRIVE%\syslinux.cfg ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg -ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,512 quiet >> %DRIVE%\syslinux.cfg +ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,512 quiet vga=current >> %DRIVE%\syslinux.cfg GOTO END :InvalidDrive diff --git a/packages/tools/syslinux/files/create_livestick.exe b/packages/tools/syslinux/files/create_livestick.exe old mode 100755 new mode 100644 index 3b15922423fb01228a6dd6a12893573be0511a9e..7355010024c0c72373d5cec80ae4b1c7d492a7bd GIT binary patch delta 11092 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 k6Ta*z>% diff --git a/tools/nsis-installer/oeinstaller.nsi b/tools/nsis-installer/oeinstaller.nsi old mode 100755 new mode 100644 index c836c4fe82..8ce3800c79 --- a/tools/nsis-installer/oeinstaller.nsi +++ b/tools/nsis-installer/oeinstaller.nsi @@ -147,15 +147,15 @@ Section "oeusbstart" ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL installer' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run OpenELEC Installer' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' KERNEL /KERNEL' - ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC installer quiet' + ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC installer quiet vga=current' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL live' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run OpenELEC Live' ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' KERNEL /KERNEL' ${If} $STORAGE_SIZE == "0" - ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet $SSH_PARAM' + ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet vga=current $SSH_PARAM' ${Else} - ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,$STORAGE_SIZE quiet $SSH_PARAM' + ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,$STORAGE_SIZE quiet vga=current $SSH_PARAM' ${EndIf} ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '' DetailPrint "" From b4886ff7cd89f8bfefb0325fdd4101f95161da52 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 22 Mar 2013 20:04:04 +0200 Subject: [PATCH 3/8] xbmc: init: don't write directly to logfile, use 'logger' instead --- packages/mediacenter/xbmc/init.d/93_xbmc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 24d1577b5d..936604ce98 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -39,9 +39,9 @@ fi # starting autostart script (will be removed later again, dont use it!!!) AUTOSTART="/storage/.config/autostart.sh" if [ -f $AUTOSTART ]; then - echo "!!! AUTOSTART script detected !!!" >> /var/log/messages - cat "$AUTOSTART" >> /var/log/messages - echo "!!! -End of autostart script- !!!" >> /var/log/messages + echo '!!! AUTOSTART script detected !!!' | logger -t Boot + cat "$AUTOSTART" | logger -t Boot + echo '!!! -End of autostart script- !!!' | logger -t Boot sh $AUTOSTART fi From 8d68698bdb541f720b646c3e21207c6014501390 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 22 Mar 2013 20:05:06 +0200 Subject: [PATCH 4/8] busybox: implement a custom 'shutdown' script. use with care! closes #2097 --- .../sysutils/busybox/profile.d/safe-shutdown.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/sysutils/busybox/profile.d/safe-shutdown.conf b/packages/sysutils/busybox/profile.d/safe-shutdown.conf index 69710d03a5..dfe7dd7ddf 100644 --- a/packages/sysutils/busybox/profile.d/safe-shutdown.conf +++ b/packages/sysutils/busybox/profile.d/safe-shutdown.conf @@ -27,7 +27,18 @@ omit_pids+=( $@ ) } + _shutdown_script () { + SHUTDOWN="/storage/.config/shutdown.sh" + if [ -f $SHUTDOWN ]; then + echo '!!! SHUTDOWN script detected !!!' | logger -t shutdown.sh + cat "$SHUTDOWN" | logger -t shutdown.sh + echo '!!! -End of shutdown script- !!!' | logger -t shutdown.sh + sh $SHUTDOWN + fi + } + _safe_shutdown () { + _shutdown_script add_omit_pids $(pidof connmand) add_omit_pids $(pidof dbus-daemon) killall5 -15 ${omit_pids[@]/#/-o } From 902ae4a600f2d9d630fed12910c6eecc26e8ba41 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:04:47 +0100 Subject: [PATCH 5/8] busybox: dont start various init scripts in installer mode Signed-off-by: Stephan Raue --- .../busybox/init.d/02_make-directories | 38 ++++++++++--------- .../sysutils/busybox/init.d/06_systemconfig | 2 +- packages/sysutils/busybox/init.d/10_cdrom | 2 +- packages/sysutils/busybox/init.d/23_syslogd | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/packages/sysutils/busybox/init.d/02_make-directories b/packages/sysutils/busybox/init.d/02_make-directories index 096e5b6f64..70c93b066b 100644 --- a/packages/sysutils/busybox/init.d/02_make-directories +++ b/packages/sysutils/busybox/init.d/02_make-directories @@ -38,11 +38,8 @@ progress "make variable directory structure" touch /var/run/utmp chmod 1777 /var/run/utmp -progress "make runtime directory structure" - ln -sf /storage/.config/modprobe.d /run/modprobe.d - progress "make logging directory structure" - if test "$DEBUG" = "yes"; then + if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then mkdir -p $HOME/log ln -sf $HOME/log /var/log else @@ -52,19 +49,24 @@ progress "make logging directory structure" touch /var/log/wtmp chmod 1777 /var/log/wtmp -progress "make variable library directory structure" -# others: - mkdir -p /var/lib/polkit-1 - chmod 700 /var/lib/polkit-1 - mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d - mkdir -p /var/lib/polkit-1/localauthority/20-org.d - mkdir -p /var/lib/polkit-1/localauthority/30-site.d - mkdir -p /var/lib/polkit-1/localauthority/50-local.d - mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d +if [ ! "$RUNLEVEL" = "installer" ]; then + progress "make runtime directory structure" + ln -sf /storage/.config/modprobe.d /run/modprobe.d - mkdir -p /var/lib/udisks - mkdir -p /var/lib/upower + progress "make variable library directory structure" + # others: + mkdir -p /var/lib/polkit-1 + chmod 700 /var/lib/polkit-1 + mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d + mkdir -p /var/lib/polkit-1/localauthority/20-org.d + mkdir -p /var/lib/polkit-1/localauthority/30-site.d + mkdir -p /var/lib/polkit-1/localauthority/50-local.d + mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d -progress "make caching directory structure" - mkdir -p $HOME/.cache/bluetooth - ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth + mkdir -p /var/lib/udisks + mkdir -p /var/lib/upower + + progress "make caching directory structure" + mkdir -p $HOME/.cache/bluetooth + ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth +fi diff --git a/packages/sysutils/busybox/init.d/06_systemconfig b/packages/sysutils/busybox/init.d/06_systemconfig index f0b0750dbe..5cbd4a6585 100644 --- a/packages/sysutils/busybox/init.d/06_systemconfig +++ b/packages/sysutils/busybox/init.d/06_systemconfig @@ -27,7 +27,7 @@ OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings if [ -f "$OPENELEC_SETTINGS" ]; then progress "creating system settings" - + mkdir -p /var/config cat "$OPENELEC_SETTINGS" \ | awk -F'["'\'']' '{gsub(/\"\;/, "\\\"", $4); gsub(/\&apos\;/, "\047", $4); gsub(/\&\;/, "\\&", $4); gsub(/\<\;/, "<", $4); gsub(/\>\;/, ">", $4); gsub(/\$/, "\\\$", $4); gsub(/`/, "\\`", $4); print $2"=\""$4"\"";}' \ diff --git a/packages/sysutils/busybox/init.d/10_cdrom b/packages/sysutils/busybox/init.d/10_cdrom index 0b126ec933..e82393990d 100644 --- a/packages/sysutils/busybox/init.d/10_cdrom +++ b/packages/sysutils/busybox/init.d/10_cdrom @@ -21,7 +21,7 @@ # # setup cdrom settings # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode progress "Setup some CDROM settings" sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 & diff --git a/packages/sysutils/busybox/init.d/23_syslogd b/packages/sysutils/busybox/init.d/23_syslogd index 3eb91fe548..e89918dfce 100644 --- a/packages/sysutils/busybox/init.d/23_syslogd +++ b/packages/sysutils/busybox/init.d/23_syslogd @@ -21,7 +21,7 @@ # # start syslog daemon # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode ( progress "Starting Syslog daemon" From ba3b9844606bfd911ebef2b2354a18c734904658 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:05:28 +0100 Subject: [PATCH 6/8] timezone-data: dont set timezone in installer mode Signed-off-by: Stephan Raue --- packages/sysutils/timezone-data/init.d/03_timezone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/timezone-data/init.d/03_timezone b/packages/sysutils/timezone-data/init.d/03_timezone index 04e49890c0..f976ed46d2 100644 --- a/packages/sysutils/timezone-data/init.d/03_timezone +++ b/packages/sysutils/timezone-data/init.d/03_timezone @@ -21,7 +21,7 @@ # # make variable directory structure # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode progress "setting timezone" GUISETTINGS="/storage/.xbmc/userdata/guisettings.xml" From 2737a78b5709a52da48222fd3a26682b69d2882f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:21:09 +0100 Subject: [PATCH 7/8] connman: add upstream patch to fix tethering without running dnsproxy Signed-off-by: Stephan Raue --- ..._sure_we_are_not_accessing_null-hash.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch diff --git a/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch b/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch new file mode 100644 index 0000000000..361a4f6bf0 --- /dev/null +++ b/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch @@ -0,0 +1,35 @@ +From 9944240ba52d19f04fb4bf468a8524f570e5fa6d Mon Sep 17 00:00:00 2001 +From: Jukka Rissanen +Date: Fri, 22 Mar 2013 14:15:19 +0000 +Subject: dnsproxy: Make sure we are not accessing null hash + +If dnsproxy is not in use, like when connman has been started +with -r option, then the listener_table will be NULL which can +cause crash in hash table lookup call. +--- +diff --git a/src/dnsproxy.c b/src/dnsproxy.c +index f698cfd..7a9ca91 100644 +--- a/src/dnsproxy.c ++++ b/src/dnsproxy.c +@@ -2916,6 +2916,9 @@ int __connman_dnsproxy_add_listener(int index) + if (index < 0) + return -EINVAL; + ++ if (listener_table == NULL) ++ return 0; ++ + if (g_hash_table_lookup(listener_table, GINT_TO_POINTER(index)) != NULL) + return 0; + +@@ -2947,6 +2950,9 @@ void __connman_dnsproxy_remove_listener(int index) + + DBG("index %d", index); + ++ if (listener_table == NULL) ++ return; ++ + ifdata = g_hash_table_lookup(listener_table, GINT_TO_POINTER(index)); + if (ifdata == NULL) + return; +-- +cgit v0.9.1 From 093234a14d68ceeafdd94823c72257c40a82438f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 22:26:25 +0100 Subject: [PATCH 8/8] busybox-initramfs: add support to update MACH_KERNEL for ATV1, simplyfing cleaning of update folder Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/scripts/init | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index d3d3d5fe38..5dcb5fa53f 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -488,9 +488,10 @@ check_update() { progress "Checking for updates" -# if [ -f "/flash/MACH_KERNEL" ]; then -# IMAGE_KERNEL="MACH_KERNEL" -# fi + # check for ATV1 mach-o-kernel + if [ -f "/flash/com.apple.Boot.plist" -a -f "/flash/boot.efi" ]; then + UPDATE_KERNEL="MACH_KERNEL" + fi if [ -f "$UPDATE_DIR/$UPDATE_KERNEL" -a -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then if [ -f "$UPDATE_DIR/.nocheck" ] ; then @@ -542,19 +543,14 @@ update_bootloader REBOOT="1" else - /bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL" - /bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM" + /bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null 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 + /bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null else - /bin/busybox rm "$UPDATE_DIR/$UPDATE_KERNEL" - /bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM" - /bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null - /bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null + /bin/busybox rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null echo "size check failed. normal startup in 30s..." /bin/busybox sync /bin/busybox usleep 30000000