gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package/dvb-apps: rely on dtv-scan-tables to provide transponder data 

This is a transitioning solution before switching packages that need the
transponders data, to use dtv-scan-tables instead of dvb-apps.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-03-28 01:00:21 +01:00 committed by Thomas Petazzoni
parent e18242fd81
commit c110099191
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dtv-scan-tables/Config.in
View File

@ -1,7 +1,5 @@
config BR2_PACKAGE_DTV_SCAN_TABLES
bool "dtv-scan-tables"
# dvb-apps installs its own set of transponder data
depends on !BR2_PACKAGE_DVB_APPS
help
The Digital TV scan tables.

1
package/dvb-apps/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_DVB_APPS
bool "dvb-apps (transponders data)"
select BR2_PACKAGE_DTV_SCAN_TABLES
help
Install the DVB-C, DVB-S, DVB-T and ATSC transponders data.

23
package/dvb-apps/dvb-apps.mk
View File

@ -8,21 +8,13 @@ DVB_APPS_VERSION = be76da69f250
DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps
DVB_APPS_SITE_METHOD = hg
# We just install the transponders data. As this is not a 'work' as per
# traditional copyright, but just a collection of 'facts', there's probably
# no license to apply to these data files.
# To be noted however, is that the dvb-apps package bundles a copy of the
# GPLv2 and a copy of the LGPLv2.1, and that some of the source files refer
# to either the GPLv2+ or the LGPLv2.1+.
# But since we do not use any of those source files, their license do not
# apply to us.
DVB_APPS_LICENSE = unknown (probably public domain)
DVB_APPS_DEPENDENCIES = dtv-scan-tables
ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
# Utilitiess are selected, build and install everything
DVB_APPS_LICENSE += GPLv2 GPLv2+ LGPLv2.1+
DVB_APPS_LICENSE_FILES += COPYING COPYING.LGPL
DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+
DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
@ -47,13 +39,8 @@ define DVB_APPS_INSTALL_TARGET_CMDS
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/$$i; \
$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \
done
endef
# We do not really install anything, so there's no license
DVB_APPS_LICENSE = none
endif
$(eval $(generic-package))