aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2019-12-13 00:13:55 +0100
committerJoerg Bornkessel <hd_brummy@gentoo.org>2019-12-13 00:13:55 +0100
commit99a609c941caa4ef73a89bf86609a718c975b52b (patch)
tree8df0bf8e48aa04165e8490374eb893f090212808
parentBumped to version 2.7.5.1 (diff)
downloadgentoo-vdr-scripts-99a609c941caa4ef73a89bf86609a718c975b52b.tar.gz
gentoo-vdr-scripts-99a609c941caa4ef73a89bf86609a718c975b52b.tar.bz2
gentoo-vdr-scripts-99a609c941caa4ef73a89bf86609a718c975b52b.zip
proj/gentoo-vdr-scripts: several fixes
- Profiles 17.1 breaks all vdr plugins by hardcoded path reported by Raimonds Cicans on wrt bug 688174 - fails to shutdown pc for sleep on systemd, fixed by baselayout 1 removed reported by Mark Dominik B├╝rkle on wrt bug 646518 - shuts the vdr down even if nvram-wakup fails reported by Michael Brakemeier on wrt bug 298785 Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
-rw-r--r--ChangeLog7
-rwxr-xr-xbump.sh3
-rw-r--r--etc/conf.d/vdr1
-rw-r--r--etc/conf.d/vdr.cd-dvd1
-rw-r--r--etc/conf.d/vdr.periodic.epgscan1
-rw-r--r--etc/conf.d/vdr.periodic.general1
-rw-r--r--etc/conf.d/vdr.shutdown3
-rw-r--r--etc/conf.d/vdr.watchdogd1
-rwxr-xr-xusr/sbin/vdr-get-header-checksum2
-rw-r--r--usr/share/vdr/bin/vdrrecord-gate.sh2
-rw-r--r--usr/share/vdr/bin/vdrshutdown-really.sh12
-rwxr-xr-xusr/share/vdr/dvdchanger/dvdchanger_readdvd.sh2
-rwxr-xr-xusr/share/vdr/dvdchanger/dvdchanger_writedvd.sh2
-rw-r--r--usr/share/vdr/rcscript/post-start-60-check-syslog-errors.sh2
-rw-r--r--usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh17
-rw-r--r--vdrplugin-rebuild/vdrplugin-rebuild2
16 files changed, 26 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index aeeff94..ad1d661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
# ChangeLog for gentoo-vdr-scripts
-# $Id$
+
+ 12 Dec 2019 <Joerg Bornkessel> (hd_brummy@gentoo.org)
+ SYMLINK_LIB=no / 17.1 profiles wrt bug #688174
+ support for Baselayout 1 removed, this will fix wrt bug #646518
+ shuts the vdr down even if nvram-wakup fails, fix wrt bug #298785
+ white space cleanup
*gentoo-vdr-scripts-2.7.5.1 (12 Jun 2016)
diff --git a/bump.sh b/bump.sh
index a6366b0..8f85f3c 100755
--- a/bump.sh
+++ b/bump.sh
@@ -18,8 +18,7 @@ sed -e "3a\\
" -i ChangeLog
echo "local bump"
-git commit -m "Bumped to version ${NEWVERS}" ChangeLog README
-
+git commit -s -m "Bumped to version ${NEWVERS}" ChangeLog README
git tag gentoo-vdr-scripts-$NEWVERS
#git push origin :gentoo-vdr-scripts-$NEWVERS
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index b292df6..0067f18 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -1,5 +1,4 @@
# /etc/conf.d/vdr:
-# $Id$
# Global config file for vdr rc-scripts
###########################################################
diff --git a/etc/conf.d/vdr.cd-dvd b/etc/conf.d/vdr.cd-dvd
index 3dc6fdc..2c52b59 100644
--- a/etc/conf.d/vdr.cd-dvd
+++ b/etc/conf.d/vdr.cd-dvd
@@ -1,4 +1,3 @@
-# $Id$
# /etc/conf.d/vdr.cd-dvd:
# Settings for plugins using cd/dvd-drives
diff --git a/etc/conf.d/vdr.periodic.epgscan b/etc/conf.d/vdr.periodic.epgscan
index b9a9d05..b69618d 100644
--- a/etc/conf.d/vdr.periodic.epgscan
+++ b/etc/conf.d/vdr.periodic.epgscan
@@ -1,4 +1,3 @@
-# $Id$
# Configuration settings for vdr related to shutdown
#
diff --git a/etc/conf.d/vdr.periodic.general b/etc/conf.d/vdr.periodic.general
index cceddcd..f31d5a8 100644
--- a/etc/conf.d/vdr.periodic.general
+++ b/etc/conf.d/vdr.periodic.general
@@ -1,4 +1,3 @@
-# $Id$
# Configuration settings for vdr related to periodic jobs
#
diff --git a/etc/conf.d/vdr.shutdown b/etc/conf.d/vdr.shutdown
index c4fb6b0..f79d13f 100644
--- a/etc/conf.d/vdr.shutdown
+++ b/etc/conf.d/vdr.shutdown
@@ -1,4 +1,3 @@
-# $Id$
# Configuration settings for vdr related to shutdown and wakeup
#
@@ -194,7 +193,7 @@
# When shutdown is aborted the default-time to retry
# the shutdown
# allowed values: number of minutes
-# default: 10 minutes
+# default: 5 minutes
#SHUTDOWN_DEFAULT_RETRY_TIME="10"
#
diff --git a/etc/conf.d/vdr.watchdogd b/etc/conf.d/vdr.watchdogd
index c6f8ccd..62876e7 100644
--- a/etc/conf.d/vdr.watchdogd
+++ b/etc/conf.d/vdr.watchdogd
@@ -1,4 +1,3 @@
-# $Id$
# /etc/conf.d/vdr.watchdog:
# Settings for external vdr watchdog
diff --git a/usr/sbin/vdr-get-header-checksum b/usr/sbin/vdr-get-header-checksum
index fa38ce4..f0846f8 100755
--- a/usr/sbin/vdr-get-header-checksum
+++ b/usr/sbin/vdr-get-header-checksum
@@ -33,7 +33,7 @@ verbose "Creating vdr header files checksum of ${include_dir}"
plugin_dir="$(awk '/^PLUGINLIBDIR/{ print $3 }' ${include_dir}/Make.config)"
if [ -n "${plugin_dir}" ]; then
- plugin_dir=/usr/lib/vdr/plugins
+ plugin_dir="(pkg-config --variable=libdir vdr)"
fi
vdr_checksum_dir="${plugin_dir%/plugins}/checksums"
diff --git a/usr/share/vdr/bin/vdrrecord-gate.sh b/usr/share/vdr/bin/vdrrecord-gate.sh
index 8e733d5..a2a7882 100644
--- a/usr/share/vdr/bin/vdrrecord-gate.sh
+++ b/usr/share/vdr/bin/vdrrecord-gate.sh
@@ -13,7 +13,7 @@ if [ -z "${EXECUTED_BY_VDR_BG}" ]; then
fi
HOOKDIR=/usr/share/vdr/record
-OLD_HOOKDIR=/usr/lib/vdr/record
+OLD_HOOKDIR="(pkg-config --variable=libdir vdr)"/../record
. /usr/share/vdr/inc/functions.sh
diff --git a/usr/share/vdr/bin/vdrshutdown-really.sh b/usr/share/vdr/bin/vdrshutdown-really.sh
index b4f2217..bdfa425 100644
--- a/usr/share/vdr/bin/vdrshutdown-really.sh
+++ b/usr/share/vdr/bin/vdrshutdown-really.sh
@@ -1,8 +1,9 @@
#!/bin/sh
# $Id$
# Author:
-# Matthias Schwarzott <zzam@gmx.de>
-# Various other contributors from gentoo.de
+# Matthias Schwarzott <zzam@gmx.de>
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Various other contributors from gentoo.de
#
# some ideas from ctvdr's shutdownvdr by Tobias Grimm <tg@e-tobi.net>
#
@@ -43,7 +44,9 @@ VDR_TIMER_CHANNEL="${3}"
VDR_TIMER_FILENAME="${4}"
VDR_USERSHUTDOWN="${5}"
-: ${SHUTDOWN_DEFAULT_RETRY_TIME:=10}
+# include this to override the default shutdown_default_retry_time
+. /etc/conf.d/vdr.shutdown
+: ${SHUTDOWN_DEFAULT_RETRY_TIME:=5}
if [ "${DEBUG}" -ge 1 ]; then
exec </dev/null >/tmp/vdrshutdown-really.log 2>&1
@@ -58,6 +61,7 @@ fi
svdrp_send() {
${SVDRPCMD} "$@"
+ logger -t mesg -p user.warn "$*"
}
mesg() {
@@ -224,7 +228,7 @@ if is_shutdown_aborted; then
mesg "No Shutdown: ${ABORT_MESSAGE}"
check_forced_shutdown_possible_next_time
check_auto_retry
-
+
exit 0
fi
diff --git a/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh b/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh
index 8ed0e9c..ba1cc08 100755
--- a/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh
+++ b/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh
@@ -21,7 +21,7 @@ svdrp_command
if [[ -z ${EXECUTED_BY_VDR_BG} ]]; then
VDR_BG=/usr/share/vdr/bin/vdr-bg.sh
- [[ -e ${VDR_BG} ]] || VDR_BG=/usr/lib/vdr/bin/vdr-bg.sh
+ [[ -e ${VDR_BG} ]] || VDR_BG="$(pkg-config --variable=libdir vdr)"/../vdr-bg.sh
exec "${VDR_BG}" "${0}" "${@}"
exit
diff --git a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh
index b6a1433..9aac168 100755
--- a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh
+++ b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh
@@ -10,7 +10,7 @@ svdrp_command
if [[ -z ${EXECUTED_BY_VDR_BG} ]]; then
VDR_BG=/usr/share/vdr/bin/vdr-bg.sh
- [[ -e ${VDR_BG} ]] || VDR_BG=/usr/lib/vdr/bin/vdr-bg.sh
+ [[ -e ${VDR_BG} ]] || VDR_BG="$(pkg-config --variable=libdir vdr)"/../vdr-bg.sh
exec "${VDR_BG}" "${0}" "${@}"
exit
diff --git a/usr/share/vdr/rcscript/post-start-60-check-syslog-errors.sh b/usr/share/vdr/rcscript/post-start-60-check-syslog-errors.sh
index 8295e4b..b33d1a6 100644
--- a/usr/share/vdr/rcscript/post-start-60-check-syslog-errors.sh
+++ b/usr/share/vdr/rcscript/post-start-60-check-syslog-errors.sh
@@ -24,7 +24,7 @@ addon_main() {
| sed '/vdr.*ERROR/!d
s/^.* ERROR: /ERROR: /
/unknown config parameter:/d
- s#ERROR: /usr/lib/vdr/plugins/#ERROR: loading plugin #
+ s#ERROR: "$(pkg-config --variable=libdir vdr)"/#ERROR: loading plugin #
' \
| while read line; do
count=$(($count+1))
diff --git a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh
index 5783cb3..99463e9 100644
--- a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh
+++ b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh
@@ -1,24 +1,15 @@
-# $Id$
-if [ ! -f /etc/init.d/sysfs ]; then
-# Baselayout 1
-. /etc/conf.d/clock
- else
# Baselayout 2
. /etc/conf.d/hwclock
-fi
-
do_systohc() {
- hwclock --systohc
+ hwclock --systohc
}
if yesno "${SHUTDOWN_SYSTOHC:-no}"; then
- if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ] ;then
-
- do_systohc
-
- fi
+ if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ] ;then
+ do_systohc
+ fi
fi
diff --git a/vdrplugin-rebuild/vdrplugin-rebuild b/vdrplugin-rebuild/vdrplugin-rebuild
index 42e7bd7..72576ec 100644
--- a/vdrplugin-rebuild/vdrplugin-rebuild
+++ b/vdrplugin-rebuild/vdrplugin-rebuild
@@ -268,7 +268,7 @@ get_vdr_plugin_dir() {
local d include_dir=/usr/include/vdr
d="$(awk '/^PLUGINLIBDIR/{ print $3 }' ${include_dir}/Make.config)"
if [ -n "${d}" ]; then
- d=/usr/lib/vdr/plugins
+ d="$(pkg-config --variable=libdir vdr)"
fi
echo "${d}"