diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
commit | ca79d2393519759d3fbe84472ab8bfa359c08592 (patch) | |
tree | 3d7ba19e17cc066b327ae62d004164a61ba39d9b /package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch | |
parent | 37d2ab569d83845a86b980bf4e27e27755294538 (diff) | |
parent | 1942836999ad64b7a84bd95a6bd1f5c75b81bf45 (diff) | |
download | buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.tar.gz buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.zip |
Merge branch 'next'
Diffstat (limited to 'package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch')
-rw-r--r-- | package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch new file mode 100644 index 000000000..cc25c564c --- /dev/null +++ b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch @@ -0,0 +1,66 @@ +Do not download transponder data as part of the build + +If dvb-scan is enabled, tvheadend will download the transponders data +from the dvb-apps package. This does not play well with buildroot. + +Instead, we rely on the dvb-apps package to install those files, so +it is no longer needed to install those as part of tvheadend. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure +--- tvheadend-v3.5.orig/configure 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/configure 2013-02-16 15:41:16.675556099 +0100 +@@ -178,15 +178,16 @@ + # + # DVB scan + # +-if enabled linuxdvb && enabled dvbscan; then +- printf "${TAB}" "fetching dvb-scan files ..." +- ${ROOTDIR}/support/getmuxlist +- if [ $? -ne 0 ]; then +- echo "fail" +- die "Failed to fetch dvb-scan data (use --disable-dvbscan)" +- fi +- echo "ok" +-fi ++# For buildroot, we already installed those files via the dvb-apps package ++#if enabled linuxdvb && enabled dvbscan; then ++# printf "${TAB}" "fetching dvb-scan files ..." ++# ${ROOTDIR}/support/getmuxlist ++# if [ $? -ne 0 ]; then ++# echo "fail" ++# die "Failed to fetch dvb-scan data (use --disable-dvbscan)" ++# fi ++# echo "ok" ++#fi + + # ########################################################################### + # Write config +Binary files tvheadend-v3.5.orig/.configure.swp and tvheadend-v3.5/.configure.swp differ +diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile +--- tvheadend-v3.5.orig/Makefile 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/Makefile 2013-02-16 15:41:38.218821287 +0100 +@@ -207,7 +207,7 @@ + SRCS-${CONFIG_BUNDLE} += bundle.c + BUNDLES-yes += docs/html docs/docresources src/webui/static + BUNDLES-yes += data/conf +-BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan ++#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan + BUNDLES = $(BUNDLES-yes) + + # +diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk +--- tvheadend-v3.5.orig/support/posix.mk 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/support/posix.mk 2013-02-16 15:42:41.015290003 +0100 +@@ -15,6 +15,10 @@ + + find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true + ++ mkdir -p ${DESTDIR}${datadir}/tvheadend/data ++ rm -f ${DESTDIR}${datadir}/tvheadend/data/dvb-scan ++ ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan ++ + uninstall: + rm -f ${DESTDIR}${bindir)/tvheadend + rm -f ${DESTDIR}${mandir)/tvheadend.1 |