tvheadend42: backport patch to fix jenkins

This commit is contained in:
cvh 2018-02-15 18:23:31 +01:00
parent 6205418ae1
commit b4b12d2682

View File

@ -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)/%)