From 843db449d901722e602ad29df213d8fee757eea8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 Oct 2014 20:28:27 +0200 Subject: [PATCH] package/tvheadend: Enable bundled build host-python is needed to create a bundled version of the tvheadend binary which includes all files used by the web UI. Having host-python alone as dependency is not enough, we need to add --enable-bundle to enable this functionality. Also remove the now bundled webinterface files from /usr/share/tvheadend/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 54112a6593..979c321684 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -37,6 +37,7 @@ define TVHEADEND_CONFIGURE_CMDS --cpu="$(BR2_GCC_TARGET_CPU)" \ --python="$(HOST_DIR)/usr/bin/python" \ --disable-dvbscan \ + --enable-bundle \ $(TVHEADEND_CONF_OPTS) \ ) endef @@ -49,6 +50,15 @@ define TVHEADEND_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install endef +# Remove documentation and source files that are not needed because we +# use the bundled web interface version. +define TVHEADEND_CLEAN_SHARE + rm -rf $(TARGET_DIR)/usr/share/tvheadend/docs + rm -rf $(TARGET_DIR)/usr/share/tvheadend/src +endef + +TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_CLEAN_SHARE + #---------------------------------------------------------------------------- # To run tvheadend, we need: # - a startup script, and its config file @@ -59,7 +69,7 @@ define TVHEADEND_INSTALL_DB $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1 chmod -R go-rwx $(TARGET_DIR)/home/tvheadend endef -TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB +TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_INSTALL_DB define TVHEADEND_INSTALL_INIT_SYSV $(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend