From 642da637d9cc31e735a484bd498e6bf916ae85a8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 8 Sep 2014 14:46:10 +0200 Subject: update startupscripts --- package/kodi/files/kodi.init | 30 +++++++++++++++++++++++ package/kodi/files/kodi.postinst | 3 +++ package/kodi/files/xbmc.init | 30 ----------------------- package/kodi/files/xbmc.postinst | 3 --- package/kodi/patches/patch-tools_Linux_xbmc_sh_in | 20 +++++++++++++-- 5 files changed, 51 insertions(+), 35 deletions(-) create mode 100644 package/kodi/files/kodi.init create mode 100644 package/kodi/files/kodi.postinst delete mode 100644 package/kodi/files/xbmc.init delete mode 100644 package/kodi/files/xbmc.postinst (limited to 'package/kodi') diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init new file mode 100644 index 000000000..b15b1d6d4 --- /dev/null +++ b/package/kodi/files/kodi.init @@ -0,0 +1,30 @@ +#!/bin/sh +#PKG kodi +#INIT 95 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${kodi:-NO}" = x"NO" && exit 0 + test x"$kodi" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + export LD_LIBRARY_PATH=/opt/vc/lib + xbmc & + ;; +stop) + kill $(pgrep -f /usr/lib/xbmc/xbmc.bin) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/kodi/files/kodi.postinst b/package/kodi/files/kodi.postinst new file mode 100644 index 000000000..2620d7dd4 --- /dev/null +++ b/package/kodi/files/kodi.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf kodi NO diff --git a/package/kodi/files/xbmc.init b/package/kodi/files/xbmc.init deleted file mode 100644 index bbe65c1c2..000000000 --- a/package/kodi/files/xbmc.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -#PKG xbmc -#INIT 95 - -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${xbmc:-NO}" = x"NO" && exit 0 - test x"$xbmc" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - export LD_LIBRARY_PATH=/opt/vc/lib - xbmc & - ;; -stop) - kill $(pgrep -f /usr/lib/xbmc/xbmc.bin) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/kodi/files/xbmc.postinst b/package/kodi/files/xbmc.postinst deleted file mode 100644 index 45274da68..000000000 --- a/package/kodi/files/xbmc.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf xbmc NO diff --git a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in index 1420f2c1b..30804493f 100644 --- a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in +++ b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in @@ -1,5 +1,5 @@ --- kodi-14.0alpha4.orig/tools/Linux/xbmc.sh.in 2014-09-05 14:09:59.000000000 +0200 -+++ kodi-14.0alpha4/tools/Linux/xbmc.sh.in 2014-09-05 18:56:32.792578871 +0200 ++++ kodi-14.0alpha4/tools/Linux/xbmc.sh.in 2014-09-08 13:26:02.745294460 +0200 @@ -58,7 +58,7 @@ single_stacktrace() print_crash_report() @@ -9,7 +9,23 @@ echo "############## XBMC CRASH LOG ###############" >> $FILE echo >> $FILE echo "################ SYSTEM INFO ################" >> $FILE -@@ -100,31 +100,8 @@ print_crash_report() +@@ -70,15 +70,6 @@ print_crash_report() + echo -n " Kernel: " >> $FILE + uname -rvs >> $FILE + echo -n " Release: " >> $FILE +- if [ -f /etc/os-release ]; then +- . /etc/os-release +- echo $NAME $VERSION >> $FILE +- elif command_exists lsb_release; then +- echo >> $FILE +- lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE +- else +- echo "lsb_release not available" >> $FILE +- fi + echo "############## END SYSTEM INFO ##############" >> $FILE + echo >> $FILE + echo "############### STACK TRACE #################" >> $FILE +@@ -100,31 +91,8 @@ print_crash_report() echo "gdb not installed, can't get stack trace." >> $FILE fi echo "############# END STACK TRACE ###############" >> $FILE -- cgit v1.2.3