From b4b12d2682675548568cd1335770fb2ca53f3389 Mon Sep 17 00:00:00 2001
From: cvh <namerp@googlemail.com>
Date: Thu, 15 Feb 2018 18:23:31 +0100
Subject: [PATCH] tvheadend42: backport patch to fix jenkins

---
 .../patches/tvheadend42-02-fix-dvbscan.patch  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 packages/addons/service/tvheadend42/patches/tvheadend42-02-fix-dvbscan.patch

diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-02-fix-dvbscan.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-02-fix-dvbscan.patch
new file mode 100644
index 0000000000..10501cd979
--- /dev/null
+++ b/packages/addons/service/tvheadend42/patches/tvheadend42-02-fix-dvbscan.patch
@@ -0,0 +1,36 @@
+fixes dvb-scan for jenkins, taken from upstream master
+
+From a51cd119bef3273dd1c22362890b27c99fad8d26 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 13 Feb 2018 11:00:30 +0100
+Subject: [PATCH] Makefile: fix --disable-dvbscan, fixes #4935
+
+--- a/Makefile
++++ b/Makefile
+@@ -631,13 +631,16 @@ SRCS-${CONFIG_DBUS_1}  += src/dbus.c
+ # Watchdog
+ SRCS-${CONFIG_LIBSYSTEMD_DAEMON} += src/watchdog.c
+ 
++# DVB scan
++DVBSCAN-$(CONFIG_DVBSCAN) += check_dvb_scan
++ALL-$(CONFIG_DVBSCAN)     += check_dvb_scan
++
+ # File bundles
+ SRCS-${CONFIG_BUNDLE}     += bundle.c
+ BUNDLES-yes               += src/webui/static
+ BUNDLES-yes               += data/conf
+ BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
+ BUNDLES                    = $(BUNDLES-yes)
+-ALL-$(CONFIG_DVBSCAN)     += check_dvb_scan
+ 
+ #
+ # Documentation
+@@ -831,7 +834,7 @@ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
+ 	@mkdir -p $(dir $@)
+ 	$(pCC) $(CFLAGS) -I${ROOTDIR}/src -c -o $@ $<
+ 
+-$(BUILDDIR)/bundle.c: check_dvb_scan make_webui
++$(BUILDDIR)/bundle.c: $(DVBSCAN-yes) make_webui
+ 	@mkdir -p $(dir $@)
+ 	$(pMKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)
+