From 1c609d0e4904499b709b613da712923c36a1baf5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 1 Dec 2020 22:42:49 +0100 Subject: [PATCH] - move rcS script away from box-specific skel-root --- make/target-scripts.mk | 8 ++++++++ .../etc/init.d/rcS => general/files-etc/init.d/rcS-hd1} | 0 .../etc/init.d/rcS => general/files-etc/init.d/rcS-hd2} | 0 .../etc/init.d/rcS => general/files-etc/init.d/rcS-hd5x} | 0 .../etc/init.d/rcS => general/files-etc/init.d/rcS-hd6x} | 0 .../etc/init.d/rcS => general/files-etc/init.d/rcS-vuduo} | 0 .../init.d/rcS => general/files-etc/init.d/rcS-vuplus} | 0 7 files changed, 8 insertions(+) rename skel-root/{hd1/etc/init.d/rcS => general/files-etc/init.d/rcS-hd1} (100%) mode change 100755 => 100644 rename skel-root/{hd2/etc/init.d/rcS => general/files-etc/init.d/rcS-hd2} (100%) mode change 100755 => 100644 rename skel-root/{hd5x/etc/init.d/rcS => general/files-etc/init.d/rcS-hd5x} (100%) mode change 100755 => 100644 rename skel-root/{hd6x/etc/init.d/rcS => general/files-etc/init.d/rcS-hd6x} (100%) mode change 100755 => 100644 rename skel-root/{vuduo/etc/init.d/rcS => general/files-etc/init.d/rcS-vuduo} (100%) mode change 100755 => 100644 rename skel-root/{vuplus/etc/init.d/rcS => general/files-etc/init.d/rcS-vuplus} (100%) mode change 100755 => 100644 diff --git a/make/target-scripts.mk b/make/target-scripts.mk index d6fb7e13..e9114659 100644 --- a/make/target-scripts.mk +++ b/make/target-scripts.mk @@ -7,6 +7,7 @@ init-scripts: \ $(TARGET_sysconfdir)/init.d/globals \ $(TARGET_sysconfdir)/init.d/functions \ $(TARGET_sysconfdir)/init.d/rc \ + $(TARGET_sysconfdir)/init.d/rcS \ $(TARGET_sysconfdir)/init.d/rcK \ \ $(TARGET_sysconfdir)/init.d/camd \ @@ -44,6 +45,13 @@ $(TARGET_sysconfdir)/init.d/functions: $(TARGET_sysconfdir)/init.d/rc: $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rc $(@) +$(TARGET_sysconfdir)/init.d/rcS: +ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) + $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcS-vuplus $(@) +else + $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcS-$(BOXSERIES) $(@) +endif + $(TARGET_sysconfdir)/init.d/rcK: $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcK $(@) diff --git a/skel-root/hd1/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-hd1 old mode 100755 new mode 100644 similarity index 100% rename from skel-root/hd1/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-hd1 diff --git a/skel-root/hd2/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-hd2 old mode 100755 new mode 100644 similarity index 100% rename from skel-root/hd2/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-hd2 diff --git a/skel-root/hd5x/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-hd5x old mode 100755 new mode 100644 similarity index 100% rename from skel-root/hd5x/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-hd5x diff --git a/skel-root/hd6x/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-hd6x old mode 100755 new mode 100644 similarity index 100% rename from skel-root/hd6x/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-hd6x diff --git a/skel-root/vuduo/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-vuduo old mode 100755 new mode 100644 similarity index 100% rename from skel-root/vuduo/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-vuduo diff --git a/skel-root/vuplus/etc/init.d/rcS b/skel-root/general/files-etc/init.d/rcS-vuplus old mode 100755 new mode 100644 similarity index 100% rename from skel-root/vuplus/etc/init.d/rcS rename to skel-root/general/files-etc/init.d/rcS-vuplus