From b9e718618a9eaa8c686a011ec5db1cb2348f7636 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 27 Dec 2011 16:06:17 +0100 Subject: [PATCH] vdr: cleanup, remove unneeded configfiles and scripts Signed-off-by: Stephan Raue --- packages/testing/multimedia/vdr/build | 1 - .../testing/multimedia/vdr/config/diseqc.conf | 73 ------------------- packages/testing/multimedia/vdr/config/wakeup | 12 --- packages/testing/multimedia/vdr/install | 2 +- .../testing/multimedia/vdr/scripts/runvdr | 12 --- .../multimedia/vdr/scripts/vdrshutdown | 66 ----------------- 6 files changed, 1 insertion(+), 165 deletions(-) delete mode 100644 packages/testing/multimedia/vdr/config/diseqc.conf delete mode 100644 packages/testing/multimedia/vdr/config/wakeup delete mode 100755 packages/testing/multimedia/vdr/scripts/runvdr delete mode 100755 packages/testing/multimedia/vdr/scripts/vdrshutdown diff --git a/packages/testing/multimedia/vdr/build b/packages/testing/multimedia/vdr/build index 230832af88..31b795919e 100755 --- a/packages/testing/multimedia/vdr/build +++ b/packages/testing/multimedia/vdr/build @@ -44,4 +44,3 @@ EOF make make include-dir - diff --git a/packages/testing/multimedia/vdr/config/diseqc.conf b/packages/testing/multimedia/vdr/config/diseqc.conf deleted file mode 100644 index 3dfc70368b..0000000000 --- a/packages/testing/multimedia/vdr/config/diseqc.conf +++ /dev/null @@ -1,73 +0,0 @@ -# DiSEqC configuration for VDR -# -# Format: -# -# satellite slof polarization lof command... -# -# satellite: one of the 'S' codes defined in sources.conf -# slof: switch frequency of LNB; the first entry with -# an slof greater than the actual transponder -# frequency will be used -# polarization: V = vertical, H = horizontal, L = Left circular, R = Right circular -# lof: the local oscillator frequency to subtract from -# the actual transponder frequency -# command: -# t tone off -# T tone on -# v voltage low (13V) -# V voltage high (18V) -# A mini A -# B mini B -# Wnn wait nn milliseconds (nn may be any positive integer number) -# [xx ...] hex code sequence (max. 6) -# -# The 'command...' part is optional. -# -# Examples: - -# Full DiSEqC sequence: - -S19.2E 11700 V 9750 t v W15 [E0 10 38 F0] W15 A W15 t -S19.2E 99999 V 10600 t v W15 [E0 10 38 F1] W15 A W15 T -S19.2E 11700 H 9750 t V W15 [E0 10 38 F2] W15 A W15 t -S19.2E 99999 H 10600 t V W15 [E0 10 38 F3] W15 A W15 T - -S13.0E 11700 V 9750 t v W15 [E0 10 38 F4] W15 B W15 t -S13.0E 99999 V 10600 t v W15 [E0 10 38 F5] W15 B W15 T -S13.0E 11700 H 9750 t V W15 [E0 10 38 F6] W15 B W15 t -S13.0E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T - -# Optimized for mini DiSEqC (aka toneburst): -# -# S19.2E 11700 V 9750 t v W15 A W15 t -# S19.2E 99999 V 10600 t v W15 A W15 T -# S19.2E 11700 H 9750 t V W15 A W15 t -# S19.2E 99999 H 10600 t V W15 A W15 T -# -# S13.0E 11700 V 9750 t v W15 B W15 t -# S13.0E 99999 V 10600 t v W15 B W15 T -# S13.0E 11700 H 9750 t V W15 B W15 t -# S13.0E 99999 H 10600 t V W15 B W15 T -# -# Optimized for full DiSEqC: -# -# S19.2E 11700 V 9750 [E0 10 38 F0] -# S19.2E 99999 V 10600 [E0 10 38 F1] -# S19.2E 11700 H 9750 [E0 10 38 F2] -# S19.2E 99999 H 10600 [E0 10 38 F3] -# -# S13.0E 11700 V 9750 [E0 10 38 F4] -# S13.0E 99999 V 10600 [E0 10 38 F5] -# S13.0E 11700 H 9750 [E0 10 38 F6] -# S13.0E 99999 H 10600 [E0 10 38 F7] -# -# DisiCon-4 Single Cable Network: -# -# horizontal: 11.704 - 12.205 GHz (1. IF: 1144 - 1645 MHz) - LOF 1 (10,56 GHz) -# horizontal: 12.676 - 12.709 GHz (1. IF: 2116 - 2148 MHz) - LOF 1 (10,56 GHz) -# vertical: 12.035 - 12.107 GHz (1. IF: 955 - 1027 MHz) - LOF 3 (11,08 GHz) -# vertical: 12.464 - 12.716 GHz (1. IF: 1744 - 1996 MHz) - LOF 2 (10,72 GHz) -# -# S19.2E 99999 H 10560 t v -# S19.2E 12110 V 11080 t v -# S19.2E 99999 V 10720 t v diff --git a/packages/testing/multimedia/vdr/config/wakeup b/packages/testing/multimedia/vdr/config/wakeup deleted file mode 100644 index 270e16c332..0000000000 --- a/packages/testing/multimedia/vdr/config/wakeup +++ /dev/null @@ -1,12 +0,0 @@ -# Enable wakeup support (no/nvram/acpi) - -WAKEUP="no" - -# Mainboard type (only for nvram); keep empty for autodetection. See the file -# nvram-wakeup-boards.txt in the DOCS directory of the GeeXboX sources -# for a list of the allowed values. -BOARD_TYPE= - -# Wakeup the system in regular intervals -REGULAR_DAYS=0 # 0=disabled, 1=each day, 2=each 2'nd day, 3=... -REGULAR_TIME=01:00 # HH:MM diff --git a/packages/testing/multimedia/vdr/install b/packages/testing/multimedia/vdr/install index 9d8264b2f4..1b121cdbde 100755 --- a/packages/testing/multimedia/vdr/install +++ b/packages/testing/multimedia/vdr/install @@ -25,9 +25,9 @@ mkdir -p $INSTALL/usr/bin cp -P $PKG_BUILD/vdr $INSTALL/usr/bin - cp -P $PKG_DIR/scripts/* $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib/vdr + mkdir -p $INSTALL/usr/config/vdr cp $PKG_BUILD/sources.conf $INSTALL/usr/config/vdr cp $PKG_BUILD/diseqc.conf $INSTALL/usr/config/vdr diff --git a/packages/testing/multimedia/vdr/scripts/runvdr b/packages/testing/multimedia/vdr/scripts/runvdr deleted file mode 100755 index d2ffe7ea13..0000000000 --- a/packages/testing/multimedia/vdr/scripts/runvdr +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -VDRCMD=$1 - -[ -r /etc/locale ] && export LANG=`cat /etc/locale` -export DISPLAY=":0" - -trap 'killall -q -TERM vdr; exit 0' 15 - -while true; do - eval "$VDRCMD" -done diff --git a/packages/testing/multimedia/vdr/scripts/vdrshutdown b/packages/testing/multimedia/vdr/scripts/vdrshutdown deleted file mode 100755 index 3b89ce1181..0000000000 --- a/packages/testing/multimedia/vdr/scripts/vdrshutdown +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -. /etc/wakeup - -do_shutdown() -{ - sleep 5 -} - -do_reboot() -{ - sleep 5 -# reboot -} - -osdmsg() -{ - sleep 2 - echo "MESG $1" | nc localhost 2001 -} - -grep -q LOCAL /etc/adjtime && HWCLOCK_LOCAL_TIME="-l" - -TIMER=$1 -[ -z "$TIMER" ] && TIMER=`/usr/bin/getwakeup $HWCLOCK_LOCAL_TIME` -[ -z "$TIMER" ] && TIMER=0 - -[ -z "$WAKEUP" -o "$WAKEUP" = no -o -z "$TIMER" ] && do_shutdown - -if [ $REGULAR_DAYS -gt 0 ]; then - REGULAR_TIMER=$((`date -d "$REGULAR_TIME" +%s` + $REGULAR_DAYS * 24 * 60 * 60)) - - # when no vdr timer is set or vdr timer starts later than regular timer: - if [ $TIMER -eq 0 ] || [ $TIMER -gt 0 -a $REGULAR_TIMER -lt $TIMER ]; then - TIMER=$REGULAR_TIMER - fi -fi - -if [ "$WAKEUP" = nvram -a -x /usr/bin/nvram-wakeup ]; then - if [ -r /etc/nvram-wakeup.conf ]; then - /usr/bin/nvram-wakeup -C /etc/nvram-wakeup.conf -ls $TIMER - elif [ -n "$BOARD_TYPE" ]; then - /usr/bin/nvram-wakeup -I $BOARD_TYPE -ls $TIMER - else - /usr/bin/nvram-wakeup -ls $TIMER - fi - case $? in - 0) - do_shutdown - ;; - 1) - do_reboot - ;; - *) - osdmsg "nvram-wakeup: cannot set time, shutdown aborted!" - ;; - esac -elif [ "$WAKEUP" = acpi -a -e /sys/class/rtc/rtc0/wakealarm ]; then - echo 0 >/sys/class/rtc/rtc0/wakealarm - echo $TIMER >/sys/class/rtc/rtc0/wakealarm - echo $TIMER >/sys/class/rtc/rtc0/wakealarm - do_shutdown -else - do_shutdown -fi -