tvheadend: get ride of busybox

And other minor fixes
SynoCommunity · Feb 9, 2019 · 28b26dd · 28b26dd
1 parent 784766d
commit 28b26dd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile
@@ -20,15 +20,15 @@ CONFIGURE_ARGS += --disable-ffmpeg_static --enable-libav
 CONFIGURE_ARGS += --disable-libfdkaac_static --disable-libopus_static --disable-libtheora --disable-libtheora_static
 CONFIGURE_ARGS += --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static
 
-INSTALL_TARGET = myInstall
 POST_PATCH_TARGET = post_patch_target_tvheadend
 
-include ../../mk/spksrc.cross-cc.mk
+ifeq ($(wildcard $(FFMPEG_DIR)),)
+DEPENDS += cross/ffmpeg
+endif
 
+include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: myInstall
-myInstall:
-	$(RUN) make install DESTDIR=$(INSTALL_DIR)
+.PHONY: post_patch_target_tvheadend
 
 post_patch_target_tvheadend:
 	@if [ "$(ARCH)" = "ppc853x" ] || [ "$(ARCH)" = "qoriq" ]; then \

diff --git a/cross/util-linux/Makefile b/cross/util-linux/Makefile
@@ -15,6 +15,12 @@ LICENSE  = GPL
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS  = --without-ncurses --without-python
-CONFIGURE_ARGS += --disable-all-programs --enable-schedutils --enable-libuuid
+CONFIGURE_ARGS += --disable-all-programs --enable-libuuid
+
+ifeq ($(findstring $(ARCH), hi3535),$(ARCH))
+CONFIGURE_ARGS += --disable-schedutils
+else
+CONFIGURE_ARGS += --enable-schedutils
+endif
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile
@@ -4,7 +4,7 @@ SPK_REV = 15
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/busybox cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
 
 MAINTAINER = m4tt075
 DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP and HDHomeRun as input sources. Tvheadend offers HTTP, HTSP and SAT IP streaming.
@@ -31,21 +31,15 @@ ADMIN_PORT = ${SERVICE_PORT}
 
 POST_STRIP_TARGET = tvheadend_extra_install
 
-BUSYBOX_CONFIG = usrmng
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
 include ../../mk/spksrc.common.mk
 
 # Reuse ffmpeg libraries
 # Requires to invoke: make [package|publish] ARCH= TCVERSION=
 export FFMPEG_DIR = $(shell pwd)/../ffmpeg/work-$(ARCH)-$(TCVERSION)/install/var/packages/ffmpeg/target
 
 ifneq ($(wildcard $(FFMPEG_DIR)),)
-$(info Depend on ffmpeg package libraries)
 PRE_DEPEND_TARGET = tvheadend_pre_depend
 SPK_DEPENDS = "ffmpeg>4.1"
-else
-$(warning Build spk/ffmpeg first to depend on its libraries $(FFMPEG_DIR))
 endif
 
 include ../../mk/spksrc.spk.mk

diff --git a/spk/tvheadend/src/service-setup.sh b/spk/tvheadend/src/service-setup.sh
@@ -35,12 +35,6 @@ service_postinst ()
         FONT_NAME=`basename "${FONT_FILE}"`
         $LN "${FONTS_DIR}/${FONT_NAME}" "${CONFD_DIR}/${FONT_NAME}" >> ${INST_LOG}
     done
-
-    # Discard legacy obsolete busybox user account
-    BIN=${SYNOPKG_PKGDEST}/bin
-    $BIN/busybox --install $BIN
-    $BIN/delgroup "${USER}" "users" >> ${INST_LOG}
-    $BIN/deluser "${USER}" >> ${INST_LOG}
 }
 
 service_preupgrade ()