diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README.G-V-S_v3_update | 1 | ||||
| -rw-r--r-- | usr/share/vdr/rcscript/pre-start-30-parameter.sh | 9 | ||||
| -rw-r--r-- | var/lib/vdr/Makefile | 18 | ||||
| -rw-r--r-- | var/lib/vdr/dvd-images/.keep | 0 | ||||
| -rw-r--r-- | var/lib/vdr/dvd-images/Makefile | 14 | ||||
| -rw-r--r-- | var/lib/vdr/merged-config-files/.keep | 0 | ||||
| -rw-r--r-- | var/lib/vdr/merged-config-files/Makefile | 14 | ||||
| -rw-r--r-- | var/lib/vdr/shutdown-data/.keep | 0 | ||||
| -rw-r--r-- | var/lib/vdr/shutdown-data/Makefile | 14 |
11 files changed, 71 insertions, 15 deletions
@@ -1,15 +1,19 @@ # ChangeLog for gentoo-vdr-scripts - - - removed deprecated logger output for + - fixed test parameter in vdrplugin-rebuild, bump to version 0.6 + Reported-by: Helmut Binder <cco AT aon DOT at> + - removed obsolet CHARSET_OVERRIDE handling for older VDR (<vdr-2.1.1) + - merged-config-file, shutdown-data, dvd-images installed now + by gentoo-vdr-scripts insteeed of ebuild handling + - removed obsolet logger output for new svdrp port - moved vdr homedir /var/vdr -> /var/lib/vdr - nedded for new acct/{user,group} handling + needed for new acct/{user,group} handling - moved path in all files from /var/vdr -> /var/lib/vdr *gentoo-vdr-scripts-3.0_rc1 (11 Jan 2020) - - removed rtc-wakeup, anounced in privius version + - removed rtc-wakeup, anounced in privious version Suggested-by: Lucian Muresan <lucianm@users.sourceforge.net> - fixed path to functions.sh rather depend on sys-apps/gentoo-functions than relaying on the @@ -1,8 +1,7 @@ SHELL = /bin/bash SUBDIRS = etc usr vdrplugin-rebuild - -SUBDIRS += usr/lib/systemd/system var/lib/vdr/tmp etc/systemd/system/vdr.service.d +SUBDIRS += usr/lib/systemd/system var/lib/vdr etc/systemd/system/vdr.service.d all: @@ -20,7 +19,6 @@ install: @for DIR in $(SUBDIRS); do \ $(MAKE) -C $$DIR install; \ done - @install -m 0755 -o vdr -g vdr -d $(DESTDIR)/var/lib/vdr/{shutdown-data,merged-config-files} snapshot: git archive HEAD | bzip2 gentoo-vdr-scripts-snapshot.tar.bz2 diff --git a/README.G-V-S_v3_update b/README.G-V-S_v3_update new file mode 100644 index 0000000..783ac4f --- /dev/null +++ b/README.G-V-S_v3_update @@ -0,0 +1 @@ +ToDo
\ No newline at end of file diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh index 5dfd9e0..a35a21f 100644 --- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh +++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh @@ -7,15 +7,8 @@ addon_main() { [ -n "${VDR_IONICE}" ] && add_daemonctrl_param --ionice "${VDR_IONICE}" - if [ "${VDRVERSNUM}" -ge "20110" ]; then - # Set command line option - [ -n "${VDR_CHARSET_OVERRIDE}" ] && add_param "--chartab=${VDR_CHARSET_OVERRIDE}" - else - # Set environment // marked as deprecated up from vdr-2.1.10 - [ -n "${VDR_CHARSET_OVERRIDE}" ] && export VDR_CHARSET_OVERRIDE - fi - # parameters of vdr + [ -n "${VDR_CHARSET_OVERRIDE}" ] && add_param "--chartab=${VDR_CHARSET_OVERRIDE}" add_param "--watchdog=${INTERNAL_WATCHDOG:-60}" [ -n "${AC3_AUDIO}" ] && add_param "--audio=${AC3_AUDIO}" yesno "${MUTE}" && add_param "--mute" diff --git a/var/lib/vdr/Makefile b/var/lib/vdr/Makefile new file mode 100644 index 0000000..c251edb --- /dev/null +++ b/var/lib/vdr/Makefile @@ -0,0 +1,18 @@ +SHELL = /bin/bash + +MYDIR = $(DESTDIR)/var/lib/vdr +SUBDIRS = dvd-images merged-config-files shutdown-data tmp +BINS = +CONFS = + +all: + +install: + @install -m 0755 -o root -g root -d $(MYDIR) + #install -m 0644 -o vdr -g vdr $(CONFS) $(MYDIR) + + @for DIR in $(SUBDIRS); do \ + $(MAKE) -C $$DIR install; \ + done + +.PHONY: all install diff --git a/var/lib/vdr/dvd-images/.keep b/var/lib/vdr/dvd-images/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/var/lib/vdr/dvd-images/.keep diff --git a/var/lib/vdr/dvd-images/Makefile b/var/lib/vdr/dvd-images/Makefile new file mode 100644 index 0000000..ccff50e --- /dev/null +++ b/var/lib/vdr/dvd-images/Makefile @@ -0,0 +1,14 @@ +SHELL = /bin/bash + +MYDIR = $(DESTDIR)/var/lib/vdr/dvd-images +SUBDIRS = +BINS = +CONFS = .keep + +all: + +install: + @install -m 0755 -o vdr -g vdr -d $(MYDIR) + @install -m 0644 -o vdr -g vdr $(CONFS) $(MYDIR) + +.PHONY: all install diff --git a/var/lib/vdr/merged-config-files/.keep b/var/lib/vdr/merged-config-files/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/var/lib/vdr/merged-config-files/.keep diff --git a/var/lib/vdr/merged-config-files/Makefile b/var/lib/vdr/merged-config-files/Makefile new file mode 100644 index 0000000..15463a9 --- /dev/null +++ b/var/lib/vdr/merged-config-files/Makefile @@ -0,0 +1,14 @@ +SHELL = /bin/bash + +MYDIR = $(DESTDIR)/var/lib/vdr/merged-config-files +SUBDIRS = +BINS = +CONFS = .keep + +all: + +install: + @install -m 0755 -o vdr -g vdr -d $(MYDIR) + @install -m 0644 -o vdr -g vdr $(CONFS) $(MYDIR) + +.PHONY: all install diff --git a/var/lib/vdr/shutdown-data/.keep b/var/lib/vdr/shutdown-data/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/var/lib/vdr/shutdown-data/.keep diff --git a/var/lib/vdr/shutdown-data/Makefile b/var/lib/vdr/shutdown-data/Makefile new file mode 100644 index 0000000..d0f4354 --- /dev/null +++ b/var/lib/vdr/shutdown-data/Makefile @@ -0,0 +1,14 @@ +SHELL = /bin/bash + +MYDIR = $(DESTDIR)/var/lib/vdr/shutdown-data +SUBDIRS = +BINS = +CONFS = .keep + +all: + +install: + @install -m 0755 -o vdr -g vdr -d $(MYDIR) + @install -m 0644 -o vdr -g vdr $(CONFS) $(MYDIR) + +.PHONY: all install |