From d9137b76bcb6008c9b894f25a27800cdc29cf534 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 17 Jan 2014 16:15:24 +0200 Subject: [PATCH 1/2] hdhomerun: clean up. bump --- .../addons/driver/hdhomerun/changelog.txt | 2 + packages/addons/driver/hdhomerun/package.mk | 2 +- .../hdhomerun/source/bin/hdhomerun.stop | 24 -------- .../99-hdhomerun.power} | 16 ++++- .../hdhomerun/source/sleep.d/hdhomerun.power | 61 ------------------- 5 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop rename packages/addons/driver/hdhomerun/source/{bin/hdhomerun.start => sleep.d/99-hdhomerun.power} (75%) delete mode 100644 packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt index bb50573509..f27a1eca6c 100644 --- a/packages/addons/driver/hdhomerun/changelog.txt +++ b/packages/addons/driver/hdhomerun/changelog.txt @@ -1,3 +1,5 @@ +4.1.1 + clean up 4.1.0 rebuild for addon api bump 4.0.1 diff --git a/packages/addons/driver/hdhomerun/package.mk b/packages/addons/driver/hdhomerun/package.mk index dd298a3f1f..dfe517ab11 100644 --- a/packages/addons/driver/hdhomerun/package.mk +++ b/packages/addons/driver/hdhomerun/package.mk @@ -18,7 +18,7 @@ PKG_NAME="hdhomerun" PKG_VERSION="4.1" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop b/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop deleted file mode 100644 index 640c0668da..0000000000 --- a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. /etc/profile - -logger -t Hdhomerun "### Hdhomerun manual stop ###" -killall userhdhomerun diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start b/packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power similarity index 75% rename from packages/addons/driver/hdhomerun/source/bin/hdhomerun.start rename to packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power index 043696460a..f2387e6a47 100644 --- a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start +++ b/packages/addons/driver/hdhomerun/source/sleep.d/99-hdhomerun.power @@ -20,7 +20,17 @@ . /etc/profile -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun" +oe_setup_addon driver.dvb.hdhomerun -logger -t Hdhomerun "### Hdhomerun manual start ###" -. $ADDON_DIR/bin/userspace-driver.sh +if [ "$SUSPEND_DRIVER" = "true" ]; the + case "$1" in + pre) + killall -9 userhdhomerun &>/dev/null + rmmod dvb_hdhomerun_fe &>/dev/null + rmmod dvb_hdhomerun &>/dev/null + rmmod dvb_hdhomerun_core &>/dev/null + ;; + post) + ;; + esac +fi diff --git a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power b/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power deleted file mode 100644 index 825144aa16..0000000000 --- a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. /etc/profile - -HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun" -HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun" -HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml" - -if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then - cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS -fi - -mkdir -p /var/config -cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf -. /var/config/hdhomerun-addon.conf - -if [ "$SUSPEND_DRIVER" = "true" ]; then - LOCKDIR="/var/lock" - LOCKFILE="$LOCKDIR/hdhomerun" - - case "$1" in - hibernate|suspend|pre) - if [ -n "$(pidof userhdhomerun)" ]; then - progress "Shutting down HDHomeRun driver for suspending..." - mkdir -p "$LOCKDIR" - touch "$LOCKFILE" - killall -9 userhdhomerun - fi - ;; - - thaw|resume|post) - if [ -f "$LOCKFILE" ]; then - # driver started within Tvheadend/VDR - rm -f "$LOCKFILE" - fi - ;; - - *) exit $NA - ;; - esac -else - progress "Suspend/resume of HDHomeRun driver not enabled..." -fi From 4da33509455c936b16c6ddbf2c548eafaf0a2cfc Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 17 Jan 2014 16:33:02 +0200 Subject: [PATCH 2/2] sundtek-mediatv: clean up. bump --- .../driver/sundtek-mediatv/changelog.txt | 2 + .../addons/driver/sundtek-mediatv/package.mk | 2 +- .../sundtek-mediatv/source/bin/sundtek.stop | 28 --------- .../99-sundtek-mediatv.power} | 13 +++- .../source/sleep.d/sundtek-mediatv.power | 61 ------------------- 5 files changed, 13 insertions(+), 93 deletions(-) delete mode 100644 packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop rename packages/addons/driver/sundtek-mediatv/source/{bin/sundtek.start => sleep.d/99-sundtek-mediatv.power} (83%) delete mode 100644 packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index bcfc167c65..0aeaeca911 100644 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,5 @@ +4.1.1 + clean up 4.1.0 rebuild for addon api bump 4.0.1 diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 7558dbd210..2a38cf996f 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -18,7 +18,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="4.1" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop deleted file mode 100644 index 3236a9f056..0000000000 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. /etc/profile - -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" - -export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so - -logger -t Sundtek "### Sundtek manual stop ###" -mediaclient --shutdown diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start b/packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power similarity index 83% rename from packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start rename to packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power index 02f7c15478..7a2e93324f 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start +++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power @@ -20,7 +20,14 @@ . /etc/profile -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" +oe_setup_addon driver.dvb.sundtek-mediatv -logger -t Sundtek "### Sundtek manual start ###" -. $ADDON_DIR/bin/userspace-driver.sh +if [ "$SUSPEND_DRIVER" = "true" ]; then + case "$1" in + pre) + killall -9 mediasrv &>/dev/null + ;; + post) + ;; + esac +fi diff --git a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power deleted file mode 100644 index 2d9afddc72..0000000000 --- a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. /etc/profile - -SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" -SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv" -SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml" - -if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then - cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS -fi - -mkdir -p /var/config -cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf -. /var/config/sundtek-addon.conf - -if [ "$SUSPEND_DRIVER" = "true" ]; then - LOCKDIR="/var/lock/" - LOCKFILE="$LOCKDIR/sundtek-mediatv" - - case "$1" in - hibernate|suspend|pre) - if [ -n "$(pidof mediasrv)" ]; then - progress "Shutting down Sundtek DVB driver for suspending..." - mkdir -p "$LOCKDIR" - touch "$LOCKFILE" - killall -9 mediasrv - fi - ;; - - thaw|resume|post) - if [ -f "$LOCKFILE" ]; then - # driver started within Tvheadend/VDR - rm -f "$LOCKFILE" - fi - ;; - - *) exit $NA - ;; - esac -else - progress "Suspend/resume of Sundtek driver not enabled..." -fi