diff --git a/make/target-scripts.mk b/make/target-scripts.mk index 4b868db7..f5d8c52a 100644 --- a/make/target-scripts.mk +++ b/make/target-scripts.mk @@ -24,7 +24,6 @@ init-scripts: \ $(TARGET_sysconfdir)/init.d/proc \ $(TARGET_sysconfdir)/init.d/rc.local \ $(TARGET_sysconfdir)/init.d/resizerootfs \ - $(TARGET_sysconfdir)/init.d/swap \ $(TARGET_sysconfdir)/init.d/sys_update.sh \ $(TARGET_sysconfdir)/init.d/syslogd \ $(TARGET_sysconfdir)/init.d/sendsigs \ @@ -117,12 +116,6 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/resizerootfs.init $(@) endif -$(TARGET_sysconfdir)/init.d/swap: -ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/swap.init $(@) - $(UPDATE-RC.D) $(@F) stop 98 0 6 . -endif - $(TARGET_sysconfdir)/init.d/sys_update.sh: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sys_update.sh $(@) diff --git a/make/target-tools.mk b/make/target-tools.mk index 1204e04d..fda646d0 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -62,6 +62,10 @@ ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4ks $(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) endef + define BUSYBOX_INSTALL_SWAP + $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/swap.init $(TARGET_sysconfdir)/init.d/swap + $(UPDATE-RC.D) swap stop 98 0 6 . + endef define BUSYBOX_SET_HEXDUMP $(call KCONFIG_ENABLE_OPT,CONFIG_HEXDUMP,$(BUSYBOX_BUILD_CONFIG)) @@ -120,6 +124,7 @@ define BUSYBOX_ADD_TO_SHELLS endef define BUSYBOX_INSTALL_FILES + $(BUSYBOX_INSTALL_SWAP) $(BUSYBOX_INSTALL_FBSET) endef diff --git a/skel-root/general/scripts/swap.init b/package/busybox/files/swap.init similarity index 100% rename from skel-root/general/scripts/swap.init rename to package/busybox/files/swap.init