jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Raue 2013-08-29 19:33:50 +02:00
commit 3084128dde
12 changed files with 105 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power
View File

@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
LOCKFILE="$LOCKDIR/hdhomerun"
case "$1" in
hibernate|suspend)
hibernate|suspend|pre)
if [ -n "$(pidof userhdhomerun)" ]; then
progress "Shutting down HDHomeRun driver for suspending..."
mkdir -p "$LOCKDIR"
@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
fi
;;
thaw|resume)
thaw|resume|post)
if [ -f "$LOCKFILE" ]; then
# driver started within Tvheadend/VDR
rm -f "$LOCKFILE"

4
packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
View File

@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
LOCKFILE="$LOCKDIR/sundtek-mediatv"
case "$1" in
hibernate|suspend)
hibernate|suspend|pre)
if [ -n "$(pidof mediasrv)" ]; then
progress "Shutting down Sundtek DVB driver for suspending..."
mkdir -p "$LOCKDIR"
@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
fi
;;
thaw|resume)
thaw|resume|post)
if [ -f "$LOCKFILE" ]; then
# driver started within Tvheadend/VDR
rm -f "$LOCKFILE"

17
packages/addons/service/multimedia/boblightd/source/bin/boblightd.start
View File

@ -39,23 +39,25 @@ BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
LOCKDIR="/var/lock/"
LOCKFILE="boblightd.disabled"
LOCKFILE_SLEEP="boblightd.sleep"
export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
fi
rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
boblightd.stop
rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
if [ -f "$BOBLIGHT_CONFIG" ] ; then
if [ ! "$(pidof boblightd)" ]; then
while [ true ] ; do
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
usleep 100000
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
# Make sure the xserver has started up
wait_for_xorg
# Start the boblight daemon
boblightd -c $BOBLIGHT_CONFIG >> $LOG_FILE 2>&1
done &
@ -64,11 +66,12 @@ if [ -f "$BOBLIGHT_CONFIG" ] ; then
if [ -e $BOBLIGHT_X11 ]; then
if [ ! "$(pidof boblight-X11)" ]; then
while [ true ] ; do
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
usleep 100000
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
# Make sure the xserver has started up
wait_for_xorg
# Start the boblight daemon
boblight-X11 >> $LOG_FILE 2>&1
done &

20
packages/addons/service/multimedia/boblightd/source/bin/boblightd.stop
View File

@ -24,14 +24,22 @@
LOCKDIR="/var/lock/"
LOCKFILE="boblightd.disabled"
LOCKFILE_SLEEP="boblightd.sleep"
mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof boblightd)" ];then
killall boblightd
if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
touch "$LOCKDIR/$LOCKFILE"
fi
if [ "$(pidof boblight-X11)" ];then
killall boblight-X11
if [ "$(pidof boblightd)" ] ; then
killall -q boblightd
killall -q boblight-X11
for seq in `seq 1 10` ; do
if [ ! "$(pidof boblightd boblight-X11)" ] ; then
break
fi
usleep 200000
done
killall -q -9 boblightd
killall -q -9 boblight-X11
fi

15
packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power
View File

@ -22,19 +22,18 @@
. /etc/profile
LOCKFILE="/var/lock/boblightd.sleep"
LOCKFILE_SLEEP="/var/lock/boblightd.sleep"
case "$1" in
hibernate|suspend)
hibernate|suspend|pre)
progress "Shutting down boblightd for suspending..."
touch $LOCKFILE_SLEEP
boblightd.stop
touch $LOCKFILE
;;
thaw|resume)
progress "Restarting boblightd for wakeup..."
if [ -f "$LOCKFILE" ] ; then
rm -rf "$LOCKFILE"
boblightd.start
thaw|resume|post)
if [ -f "$LOCKFILE_SLEEP" ] ; then
progress "Restarting boblightd for wakeup..."
rm -rf "$LOCKFILE_SLEEP"
fi
;;
*) exit $NA

27
packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
View File

@ -24,6 +24,7 @@
LOCKDIR="/var/lock/"
LOCKFILE="tvheadend.disabled"
LOCKFILE_SLEEP="tvheadend.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
ADDON_SYS_DIR="/usr/lib/xbmc/addons/service.multimedia.tvheadend"
@ -113,24 +114,24 @@ mkdir -p /var/config
. /var/config/tvheadend.conf.default
. /var/config/tvheadend.conf
rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
tvheadend.stop
rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
if [ ! "$(pidof $ADDON_BIN)" ]; then
# start userspace DVB driver/addon
for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
# use ". " because of variable export
. $driver_dvb
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
fi
while [ true ] ; do
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
usleep 100000
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
# start userspace DVB driver/addon
for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
# use ". " because of variable export
. $driver_dvb
done
# (wait for) at least 1 adapter (xbmc allows to set 0)
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then

18
packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.stop
View File

@ -24,12 +24,22 @@
LOCKDIR="/var/lock/"
LOCKFILE="tvheadend.disabled"
LOCKFILE_SLEEP="tvheadend.sleep"
ADDON_BIN="tvheadend"
mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof $ADDON_BIN)" ];then
killall $ADDON_BIN
if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
touch "$LOCKDIR/$LOCKFILE"
fi
if [ "$(pidof $ADDON_BIN)" ] ; then
killall -q $ADDON_BIN
for seq in `seq 1 10` ; do
if [ ! "$(pidof $ADDON_BIN)" ] ; then
break
fi
usleep 200000
done
killall -q -9 $ADDON_BIN
fi

23
packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
View File

@ -26,40 +26,29 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
LOCKFILE="/var/lock/tvheadend.sleep"
LOCKFILE_SLEEP="/var/lock/tvheadend.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
case "$1" in
hibernate|suspend)
hibernate|suspend|pre)
if [ "$(pidof tvheadend)" ];then
progress "Shutting down HTS TVHeadend for suspending..."
xbmc-send -a "Notification(tvheadend, Shutting down HTS TVHeadend for suspend..., 5000, $ADDON_DIR/icon.png)"
touch $LOCKFILE_SLEEP
tvheadend.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
fi
;;
thaw|resume)
if [ -f "$LOCKFILE" ] ; then
thaw|resume|post)
if [ -f "$LOCKFILE_SLEEP" ] ; then
progress "Restarting HTS TVHeadend for wakeup..."
xbmc-send -a "Notification(tvheadend, Restarting HTS TVHeadend for wakeup..., 5000, $ADDON_DIR/icon.png)"
for module in $REMOVE_MODULES ; do
modprobe $module
done
tvheadend.stop
for seq in `seq 1 10` ; do
if [ ! "$(pidof tvheadend)" ];then
break
fi
usleep 500000
done
killall -9 tvheadend &>/dev/null
rm -rf "$LOCKFILE"
tvheadend.start
rm -rf "$LOCKFILE_SLEEP"
fi
;;
*) exit $NA

25
packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
View File

@ -32,6 +32,7 @@ check_tmpfs_mount() {
LOCKDIR="/var/lock/"
LOCKFILE="vdr.disabled"
LOCKFILE_SLEEP="vdr.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
@ -148,22 +149,26 @@ MYDATA
)
rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
vdr.stop
rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
if [ ! "$(pidof vdr.bin)" ];then
# start userspace DVB driver/addon
for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
# use ". " because of variable export
. $driver_dvb
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
fi
while [ true ] ; do
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
usleep 100000
done
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
umount /var/run/vdr 2>&1
break
fi
# start userspace DVB driver/addon
for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
# use ". " because of variable export
. $driver_dvb
done
# (wait for) at least 1 adapter (xbmc allows to set 0)
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then

17
packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop
View File

@ -24,11 +24,20 @@
LOCKDIR="/var/lock/"
LOCKFILE="vdr.disabled"
LOCKFILE_SLEEP="vdr.sleep"
mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof vdr.bin)" ];then
killall vdr.bin
if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
touch "$LOCKDIR/$LOCKFILE"
fi
if [ "$(pidof vdr.bin)" ] ; then
killall -q vdr.bin
for seq in `seq 1 10` ; do
if [ ! "$(pidof vdr.bin)" ] ; then
break
fi
usleep 200000
done
killall -q -9 vdr.bin
fi

23
packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
View File

@ -27,39 +27,28 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
LOCKFILE="/var/lock/vdr.sleep"
LOCKFILE_SLEEP="/var/lock/vdr.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
case "$1" in
hibernate|suspend)
hibernate|suspend|pre)
if [ "$(pidof vdr.bin)" ];then
progress "Shutting down vdr for suspending..."
xbmc-send -a "Notification(vdr, Shutting down vdr for suspend..., 5000, $ADDON_DIR/icon.png)"
touch $LOCKFILE_SLEEP
vdr.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
fi
;;
thaw|resume)
if [ -f "$LOCKFILE" ] ; then
thaw|resume|post)
if [ -f "$LOCKFILE_SLEEP" ] ; then
progress "Restarting vdr for wakeup..."
xbmc-send -a "Notification(vdr, Restarting vdr for wakeup..., 5000, $ADDON_DIR/icon.png)"
for module in $REMOVE_MODULES ; do
modprobe $module
done
vdr.stop
for seq in `seq 1 10` ; do
if [ ! "$(pidof vdr.bin)" ];then
break
fi
usleep 500000
done
killall -9 vdr.bin &>/dev/null
rm -rf "$LOCKFILE"
vdr.start
rm -rf "$LOCKFILE_SLEEP"
fi
;;
*) exit $NA

4
packages/x11/app/setxkbmap/scripts/xkb-setup
View File

@ -20,6 +20,6 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
if [ -f $CONFIG_CACHE/xkb/layout ] ; then
cat $CONFIG_CACHE/xkb/layout
if [ -f /storage/.cache/xkb/layout ] ; then
cat /storage/.cache/xkb/layout
fi