Skip to contentSkip to conversation

package/tvheadend: Fix inclusion of dtv-scan-tables files

PATCH New Bernd Kuhls 2 participants 4 messages Apr 9, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v4 1/3 package/tvheadend: Fix inclusion of dtv-scan-tables files

--enable-dvbscan forces downloading the tables from upstream when the files are not already present in data/dvb-scan/, see support/getmuxlist.

By moving the copy command for the dvb-scan files before tvheadend configure the getmuxlist script, called by tvheadend configure, will recognize the existing directory, quote: "# Note: will not update existing set (if not .git)"

To verify the bundled contents have a look at build.linux/bundle.d. Also fix a comment typo.

Fixes
http://autobuild.buildroot.net/results/25f/25fc657dbc37228483eeefb3618be9df2ee13832/
http://autobuild.buildroot.net/results/37a/37abb5d2ec62ac59897d019e6ca85c8eb0e69786/
http://autobuild.buildroot.net/results/e86/e860e501f904d94bbab6a765aad4d19947135513/
http://autobuild.buildroot.net/results/a55/a55ab4fc34bebda14236d6a0efe893aa75374ed2/

Signed-off-by Bernd Kuhls <[email protected]>

---
v4: move comment for the dvb files download to the right place after v3
v3: fix "make tvheadend-patch" by moving TVHEADEND_INSTALL_DTV_SCAN_TABLES
to TVHEADEND_PRE_CONFIGURE_HOOKS (Yann)
v2: do not patch header files but use a better moment for copying the dvb files (Yann)

 package/tvheadend/tvheadend.mk |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
package/tvheadend/tvheadend.mk +10 -6
index d6b77da..112e7aa 100644
@@ -40,6 +40,16 @@ endif
 
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
 
+# The tvheadend build system expects the transponder data to be present inside
+# its source tree. To prevent a download initiated by the build system just
+# copy the data files in the right place and add the corresponding stamp file.
+define TVHEADEND_INSTALL_DTV_SCAN_TABLES
+	$(INSTALL) -d $(@D)/data/dvb-scan
+	cp -r $(TARGET_DIR)/usr/share/dvb/* $(@D)/data/dvb-scan/
+	touch $(@D)/data/dvb-scan/.stamp
+endef
+TVHEADEND_PRE_CONFIGURE_HOOKS += TVHEADEND_INSTALL_DTV_SCAN_TABLES
+
 define TVHEADEND_CONFIGURE_CMDS
 	(cd $(@D);						\
 		$(TARGET_CONFIGURE_OPTS)			\

@@ -57,13 +67,7 @@ define TVHEADEND_CONFIGURE_CMDS
 	)
 endef
 
-# The tvheadend build system expects the transponder data to be present inside
-# its source tree. To prevent a downloaded initiated by the build system just
-# copy the data files in the right place and add the corresponding stamp file.
 define TVHEADEND_BUILD_CMDS
-	$(INSTALL) -d $(@D)/data/dvb-scan
-	cp -r $(TARGET_DIR)/usr/share/dvb/* $(@D)/data/dvb-scan/
-	touch $(@D)/data/dvb-scan/.stamp
 	$(MAKE) -C $(@D)
 endef
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v4 2/3 package/tvheadend: bump version

Signed-off-by Bernd Kuhls <[email protected]>

---
v4: bump to current git master
v3: no changes
v2: bump to current git master

 package/tvheadend/tvheadend.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +1 -1
index 112e7aa..2a0019e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 7006b9fd88ce0cf54d59399df40fe4ee003c4180
+TVHEADEND_VERSION = 14f03b8efbc40b840eda8e203a6002d6c3f24250
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH v4 3/3 package/dtv-scan-tables: bump version

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v4: no changes
v3: no changes
v2: bump to current git master

 package/dtv-scan-tables/dtv-scan-tables.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/dtv-scan-tables/dtv-scan-tables.mk +1 -1
index 9d85325..4114d23 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DTV_SCAN_TABLES_VERSION = 1246b27f8b45f84c1824925060ad931530542f2e
+DTV_SCAN_TABLES_VERSION = f2053b34a5ac6f263edc22888b0db4b1fa563fe4
 DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git
 DTV_SCAN_TABLES_SITE_METHOD = git
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH v4 1/3 package/tvheadend: Fix inclusion of dtv-scan-tables files

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 10 lines · Bernd Kuhls

--enable-dvbscan forces downloading the tables from upstream when the files are not already present in data/dvb-scan/, see support/getmuxlist.

By moving the copy command for the dvb-scan files before tvheadend configure the getmuxlist script, called by tvheadend configure, will recognize the existing directory, quote: "# Note: will not update existing set (if not .git)"

To verify the bundled contents have a look at build.linux/bundle.d. Also fix a comment typo.

Quoted 7 lines

Fixes
http://autobuild.buildroot.net/results/25f/25fc657dbc37228483eeefb3618be9df2ee13832/
http://autobuild.buildroot.net/results/37a/37abb5d2ec62ac59897d019e6ca85c8eb0e69786/
http://autobuild.buildroot.net/results/e86/e860e501f904d94bbab6a765aad4d19947135513/
http://autobuild.buildroot.net/results/a55/a55ab4fc34bebda14236d6a0efe893aa75374ed2/

Signed-off-by Bernd Kuhls <[email protected]>

Series applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com