Commit 38cdf82a authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/dvb-apps: add option to install utilities 



Previously, dvb-apps was a 'blind' package that would install
only the transponders data files for use by external packages
(namely tvheadend).

Now, we add an option to also install the DVB utilities.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 4b2a40b6

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ source "package/devmem2/Config.in" 
endif

source "package/dmidecode/Config.in"

source "package/dmraid/Config.in"

source "package/dvb-apps/Config.in"

source "package/eeprog/Config.in"

source "package/evtest/Config.in"

source "package/flashrom/Config.in"

package/dvb-apps/Config.in

0 → 100644
+17 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_DVB_APPS

	bool "dvb-apps (transponders data)"

	help

	  Install the DVB-C, DVB-S, DVB-T and ATSC transponders data.

	  

	  http://linuxtv.org/projects.php

	  http://linuxtv.org/hg/dvb-apps



if BR2_PACKAGE_DVB_APPS



config BR2_PACKAGE_DVB_APPS_UTILS

	bool "dvb-apps utilities"

	help

	  A small number of DVB test and utility programs,

	  including szap and dvbscan.



endif

package/dvb-apps/dvb-apps.mk

+21 −2
Original line number Diff line number Diff line
@@ -18,11 +18,30 @@ DVB_APPS_SITE_METHOD = hg 
# apply to us.

DVB_APPS_LICENSE        = unknown (probably public domain)



ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)

# Utilitiess are selected, build and install everything

DVB_APPS_INSTALL_STAGING = YES



define DVB_APPS_BUILD_CMDS

	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1

endef



define DVB_APPS_INSTALL_STAGING_CMDS

	$(MAKE) -C $(@D) V=1 DESTDIR=$(STAGING_DIR) install

endef



define DVB_APPS_INSTALL_TARGET_CMDS

	$(MAKE) -C $(@D) V=1 DESTDIR=$(TARGET_DIR) install

endef



else

# Utilities are not selected, just install the scan files

define DVB_APPS_INSTALL_TARGET_CMDS

	for i in atsc dvb-c dvb-s dvb-t; do \

		mkdir -p $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \

		$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \

		mkdir -p $(TARGET_DIR)/usr/share/dvb/$$i; \

		$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \

	done

endef

endif



$(eval $(generic-package))

package/tvheadend/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ comment "tvheadend requires a toolchain with LARGEFILE support" 
config BR2_PACKAGE_TVHEADEND

	bool "tvheadend"

	depends on BR2_LARGEFILE

	select BR2_PACKAGE_DVB_APPS

	select BR2_PACKAGE_OPENSSL

	help

	  Tvheadend is a TV streaming server for Linux supporting DVB-S,

package/tvheadend/tvheadend-no-auto-download-dvbscans.patch

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk 
 	done

-

+	mkdir -p ${DESTDIR}${datadir}/tvheadend/data

+	ln -s /usr/share/dvb-apps/scan ${DESTDIR}${datadir}/tvheadend/data/dvb-scan

+	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan

 

 uninstall:

 	rm -f ${DESTDIR}${bindir)/tvheadend