From 5dbcc26de202756cbe73c05dfa0f7866f83b8a01 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Sun, 28 Oct 2012 10:49:17 +0100 Subject: [PATCH] hdhomerun: addon redesign (binary files in OpenELEC image, addon starts driver) --- packages/3rdparty/driver/dvbhdhomerun/meta | 35 ------------------ packages/3rdparty/lib/libhdhomerun/meta | 0 packages/addons/driver/hdhomerun/addon | 7 ---- .../addons/driver/hdhomerun/changelog.txt | 4 ++ .../hdhomerun/config/dvbhdhomerun.sample | 0 .../addons/driver/hdhomerun/icon/icon.png | Bin packages/addons/driver/hdhomerun/meta | 4 +- .../hdhomerun/source/bin/userspace-driver.sh | 2 - .../addons/driver/hdhomerun/source/default.py | 0 .../dvbhdhomerun/build | 5 +++ .../build => dvbhdhomerun/install} | 13 +++++-- .../{hdhomerun-driver => dvbhdhomerun}/meta | 8 ++-- .../dvbhdhomerun-0.0.10-001-conf_file.patch | 0 .../dvbhdhomerun-0.0.10-002-auto_detect.patch | 0 .../linux-drivers/hdhomerun-driver/install | 28 -------------- projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/RPi/options | 2 +- projects/Ultra/options | 2 +- projects/Virtual/options | 2 +- 24 files changed, 33 insertions(+), 91 deletions(-) delete mode 100644 packages/3rdparty/driver/dvbhdhomerun/meta mode change 100644 => 100755 packages/3rdparty/lib/libhdhomerun/meta mode change 100644 => 100755 packages/addons/driver/hdhomerun/changelog.txt mode change 100644 => 100755 packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample mode change 100644 => 100755 packages/addons/driver/hdhomerun/icon/icon.png mode change 100644 => 100755 packages/addons/driver/hdhomerun/meta mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/default.py rename packages/{3rdparty/driver => linux-drivers}/dvbhdhomerun/build (89%) rename packages/linux-drivers/{hdhomerun-driver/build => dvbhdhomerun/install} (70%) rename packages/linux-drivers/{hdhomerun-driver => dvbhdhomerun}/meta (90%) mode change 100644 => 100755 rename packages/{3rdparty/driver => linux-drivers}/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch (100%) mode change 100644 => 100755 rename packages/{3rdparty/driver => linux-drivers}/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch (100%) mode change 100644 => 100755 delete mode 100755 packages/linux-drivers/hdhomerun-driver/install diff --git a/packages/3rdparty/driver/dvbhdhomerun/meta b/packages/3rdparty/driver/dvbhdhomerun/meta deleted file mode 100644 index e14b8578e7..0000000000 --- a/packages/3rdparty/driver/dvbhdhomerun/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="dvbhdhomerun" -PKG_VERSION="0.0.10" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/" -PKG_URL="http://downloads.sourceforge.net/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libhdhomerun" -PKG_PRIORITY="optional" -PKG_SECTION="driver/dvb" -PKG_SHORTDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)." -PKG_LONGDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/lib/libhdhomerun/meta b/packages/3rdparty/lib/libhdhomerun/meta old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/addon b/packages/addons/driver/hdhomerun/addon index 3da0c88648..f006e3260b 100755 --- a/packages/addons/driver/hdhomerun/addon +++ b/packages/addons/driver/hdhomerun/addon @@ -24,10 +24,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/ cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -Pa $BUILD/libhdhomerun_*/hdhomerun_config $ADDON_BUILD/$PKG_ADDON_ID/bin/ - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -Pa $BUILD/libhdhomerun_*/libhdhomerun.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt old mode 100644 new mode 100755 index fc64fd9c6d..4e27bf7ec9 --- a/packages/addons/driver/hdhomerun/changelog.txt +++ b/packages/addons/driver/hdhomerun/changelog.txt @@ -1,3 +1,7 @@ +2.1.4 +- binary files are stored with OpenELEC image + addon is used to start userspace program + 2.1.3 - bump addon version for new kernel diff --git a/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample b/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/icon/icon.png b/packages/addons/driver/hdhomerun/icon/icon.png old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/meta old mode 100644 new mode 100755 index 0574213db7..209b701781 --- a/packages/addons/driver/hdhomerun/meta +++ b/packages/addons/driver/hdhomerun/meta @@ -20,13 +20,13 @@ PKG_NAME="hdhomerun" PKG_VERSION="2.0" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libhdhomerun dvbhdhomerun" +PKG_BUILD_DEPENDS="" PKG_PRIORITY="optional" PKG_SECTION="driver/dvb" PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)." diff --git a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh index a83d93b3a8..c2e5f750b6 100755 --- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh +++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh @@ -54,8 +54,6 @@ if [ -z "$(pidof userhdhomerun)" ]; then mkdir -p /var/log/ rm -f /var/log/dvbhdhomerun.log - export LD_LIBRARY_PATH=$ADDON_DIR/lib - userhdhomerun -f # how much time should we wait? usleep 1000000 diff --git a/packages/addons/driver/hdhomerun/source/default.py b/packages/addons/driver/hdhomerun/source/default.py old mode 100644 new mode 100755 diff --git a/packages/3rdparty/driver/dvbhdhomerun/build b/packages/linux-drivers/dvbhdhomerun/build similarity index 89% rename from packages/3rdparty/driver/dvbhdhomerun/build rename to packages/linux-drivers/dvbhdhomerun/build index 49ab57b9bb..764819f00d 100755 --- a/packages/3rdparty/driver/dvbhdhomerun/build +++ b/packages/linux-drivers/dvbhdhomerun/build @@ -31,3 +31,8 @@ cd $PKG_BUILD/userhdhomerun sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" hdhomerun_tuner.cpp make LDFLAGS="-lpthread" + $STRIP build/userhdhomerun + +cd ../kernel + LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path) + fix_module_depends dvb_hdhomerun_core.ko "dvb_core" diff --git a/packages/linux-drivers/hdhomerun-driver/build b/packages/linux-drivers/dvbhdhomerun/install similarity index 70% rename from packages/linux-drivers/hdhomerun-driver/build rename to packages/linux-drivers/dvbhdhomerun/install index c2977405ec..c80fe7b7ee 100755 --- a/packages/linux-drivers/hdhomerun-driver/build +++ b/packages/linux-drivers/dvbhdhomerun/install @@ -22,9 +22,14 @@ . config/options $1 -$SCRIPTS/unpack dvbhdhomerun +KERNEL_VER=$(ls $BUILD/linux*/modules/lib/modules) +mkdir -p $INSTALL/lib/modules/$KERNEL_VER/hdhomerun + cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$KERNEL_VER/hdhomerun/ -cd $BUILD/dvbhdhomerun-*/kernel - LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path) - fix_module_depends dvb_hdhomerun_core.ko "dvb_core" +mkdir -p $INSTALL/usr/sbin + cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $INSTALL/usr/sbin + cp -Pa $BUILD/libhdhomerun_*/hdhomerun_config $INSTALL/usr/sbin + +mkdir -p $INSTALL/lib/ + cp -Pa $BUILD/libhdhomerun_*/libhdhomerun.so $INSTALL/lib/ diff --git a/packages/linux-drivers/hdhomerun-driver/meta b/packages/linux-drivers/dvbhdhomerun/meta old mode 100644 new mode 100755 similarity index 90% rename from packages/linux-drivers/hdhomerun-driver/meta rename to packages/linux-drivers/dvbhdhomerun/meta index c276c31678..39bfadef56 --- a/packages/linux-drivers/hdhomerun-driver/meta +++ b/packages/linux-drivers/dvbhdhomerun/meta @@ -18,15 +18,15 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="hdhomerun-driver" -PKG_VERSION="0.0.10" +PKG_NAME="dvbhdhomerun" +PKG_VERSION="20120831" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/" -PKG_URL="" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain linux" +PKG_BUILD_DEPENDS="toolchain linux libhdhomerun" PKG_PRIORITY="optional" PKG_SECTION="driver/dvb" PKG_SHORTDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)." diff --git a/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch old mode 100644 new mode 100755 similarity index 100% rename from packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch diff --git a/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch old mode 100644 new mode 100755 similarity index 100% rename from packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch diff --git a/packages/linux-drivers/hdhomerun-driver/install b/packages/linux-drivers/hdhomerun-driver/install deleted file mode 100755 index 5578480677..0000000000 --- a/packages/linux-drivers/hdhomerun-driver/install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -VER=`ls $BUILD/linux*/modules/lib/modules` - -mkdir -p $INSTALL/lib/modules/$VER/hdhomerun - cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$VER/hdhomerun/ diff --git a/projects/ATV/options b/projects/ATV/options index 514a8e13d5..45c9d4b760 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -158,7 +158,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index e8c7624680..213730bea9 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 5674dbdd13..0c04526481 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 174209d5fc..dfc6aab0a3 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/ION/options b/projects/ION/options index e14029e27f..956f7611f8 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Intel/options b/projects/Intel/options index ad7682b314..5746f58358 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 3f67020e34..07cecf8832 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index f684ce4b7b..479bdf1ad0 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -157,7 +157,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" # build with network support (yes / no) NETWORK="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 7c4c854054..e48c866123 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -152,7 +152,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU vboxguest" + ADDITIONAL_DRIVERS="RTL8192CU vboxguest dvbhdhomerun" # build with network support (yes / no) NETWORK="yes"