From e32091acc36e15589c6b7d8a338b6dd682b2e51e Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 1 Nov 2021 00:09:56 +0100
Subject: [PATCH] - environment-build: add and use REMOVE-RC.D

---
 make/buildsystem-helpers.mk     |  1 +
 make/target-neutrino-plugins.mk | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk
index 25e1977b..196a26ab 100644
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -150,6 +150,7 @@ GET_GIT_ARCHIVE = support/scripts/get-git-archive.sh
 GET_GIT_SOURCE  = support/scripts/get-git-source.sh
 GET_SVN_SOURCE  = support/scripts/get-svn-source.sh
 UPDATE-RC.D     = support/scripts/update-rc.d -r $(TARGET_DIR)
+REMOVE-RC.D     = support/scripts/update-rc.d -f -r $(TARGET_DIR)
 TARGET_RM       = support/scripts/target-remove.sh $(TARGET_DIR) $(REMOVE_DIR)
 
 # -----------------------------------------------------------------------------
diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk
index 4681c4ff..5ad0b003 100644
--- a/make/target-neutrino-plugins.mk
+++ b/make/target-neutrino-plugins.mk
@@ -22,7 +22,8 @@ NEUTRINO_PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_PLUGINS_OBJ)
 
 # -----------------------------------------------------------------------------
 
-NEUTRINO_PLUGINS_DEPENDENCIES = ffmpeg
+NEUTRINO_PLUGINS_DEPENDENCIES =
+NEUTRINO_PLUGINS_DEPENDENCIES += ffmpeg
 NEUTRINO_PLUGINS_DEPENDENCIES += libcurl
 NEUTRINO_PLUGINS_DEPENDENCIES += libpng
 NEUTRINO_PLUGINS_DEPENDENCIES += libjpeg-turbo
@@ -102,7 +103,7 @@ $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO_PLUGINS_DEPENDENCIES)
 
 # -----------------------------------------------------------------------------
 
-NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS  =
+NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS =
 NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += emmrd
 NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += fritzcallmonitor
 NEUTRINO_PLUGINS_INIT_SCRIPTS_DEFAULTS += openvpn
@@ -126,9 +127,10 @@ define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL
 endef
 
 define NEUTRINO_PLUGINS_RUNLEVEL_LINKS_UNINSTALL
-	for link in $(NEUTRINO_PLUGINS_INIT_SCRIPTS); do \
-		find $(TARGET_sysconfdir) -type l -name [SK]??$$link -print0 | \
-			xargs --no-run-if-empty -0 rm -f; \
+	for script in $(NEUTRINO_PLUGINS_INIT_SCRIPTS); do \
+		if [ -x $(TARGET_DIR)/etc/init.d/$$script ]; then \
+			$(REMOVE-RC.D) $$script remove; \
+		fi; \
 	done
 endef