From 15b46d0e242d27a3155fe2427e391a35186034b2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 4 Mar 2021 22:10:20 +0100 Subject: [PATCH] - move ifupdown-scripts to package dir --- Makefile | 2 ++ make/buildsystem-bootstrap.mk | 1 - make/target-files.mk | 9 --------- make/target-scripts.mk | 5 ----- make/target-tools.mk | 1 + .../ifupdown-scripts/files}/interfaces | 0 .../ifupdown-scripts/files/network.init | 0 package/ifupdown-scripts/ifupdown-scripts.mk | 16 ++++++++++++++++ package/sysvinit/files/rcS-hd1 | 2 +- package/sysvinit/files/rcS-hd2 | 2 +- package/sysvinit/files/rcS-hd5x | 2 +- package/sysvinit/files/rcS-hd6x | 2 +- package/sysvinit/files/rcS-vuduo | 2 +- package/sysvinit/files/rcS-vuplus | 2 +- 14 files changed, 25 insertions(+), 21 deletions(-) rename {skel-root/general/files-etc/network => package/ifupdown-scripts/files}/interfaces (100%) rename skel-root/general/scripts/networking.init => package/ifupdown-scripts/files/network.init (100%) create mode 100644 package/ifupdown-scripts/ifupdown-scripts.mk diff --git a/Makefile b/Makefile index d885078c..79d60316 100755 --- a/Makefile +++ b/Makefile @@ -209,6 +209,8 @@ include make/target-tools.mk include make/target-tools-unused.mk include make/host-tools.mk +include $(sort $(wildcard package/*/*.mk)) + include make/ni.mk # for your local extensions, e.g. special plugins or similar ... diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk index e456f657..18c5419e 100644 --- a/make/buildsystem-bootstrap.mk +++ b/make/buildsystem-bootstrap.mk @@ -46,7 +46,6 @@ target-dir: mkdir -p $(TARGET_sbindir) mkdir -p $(TARGET_datadir) #mkdir -p $(TARGET_prefix)/local/{bin,include,lib,sbin,share} - mkdir -p $(TARGET_sysconfdir)/network/if-{up,pre-up,post-up,down,pre-down,post-down}.d mkdir -p $(TARGET_localstatedir)/bin mkdir -p $(TARGET_localstatedir)/etc/init.d mkdir -p $(TARGET_localstatedir)/keys diff --git a/make/target-files.mk b/make/target-files.mk index 25cd2474..9b9b97a5 100644 --- a/make/target-files.mk +++ b/make/target-files.mk @@ -4,7 +4,6 @@ # ----------------------------------------------------------------------------- files-etc: \ - $(TARGET_sysconfdir)/network/interfaces \ $(TARGET_sysconfdir)/date-dummy \ $(TARGET_sysconfdir)/filesystems \ $(TARGET_sysconfdir)/fstab \ @@ -23,14 +22,6 @@ PHONY += $(TARGET_sysconfdir)/profile.d # ----------------------------------------------------------------------------- -$(TARGET_sysconfdir)/network/interfaces: -ifeq ($(PERSISTENT_VAR_PARTITION),yes) - $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/network/interfaces $(TARGET_localstatedir)/etc/network/interfaces - ln -sf /var/etc/network/interfaces $(@) -else - $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/network/interfaces $(@) -endif - $(TARGET_sysconfdir)/date-dummy: echo "$(shell date +%Y)01010000" > $(@) diff --git a/make/target-scripts.mk b/make/target-scripts.mk index 2fa95fb6..628260a7 100644 --- a/make/target-scripts.mk +++ b/make/target-scripts.mk @@ -13,7 +13,6 @@ init-scripts: \ $(TARGET_sysconfdir)/init.d/custom-poweroff \ $(TARGET_sysconfdir)/init.d/fstab \ $(TARGET_sysconfdir)/init.d/hostname \ - $(TARGET_sysconfdir)/init.d/networking \ $(TARGET_sysconfdir)/init.d/partitions-by-name \ $(TARGET_sysconfdir)/init.d/proc \ $(TARGET_sysconfdir)/init.d/rc.local \ @@ -59,10 +58,6 @@ $(TARGET_sysconfdir)/init.d/fstab: $(TARGET_sysconfdir)/init.d/hostname: $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/hostname.init $(@) -$(TARGET_sysconfdir)/init.d/networking: - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/networking.init $(@) - $(UPDATE-RC.D) $(@F) stop 98 0 6 . - $(TARGET_sysconfdir)/init.d/partitions-by-name: ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@) diff --git a/make/target-tools.mk b/make/target-tools.mk index 997516db..4aa08218 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -132,6 +132,7 @@ endif define BUSYBOX_INSTALL_FILES $(BUSYBOX_INSTALL_SWAP) $(BUSYBOX_INSTALL_FBSET) + $(MAKE) ifupdown-scripts $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/udhcpc-default.script $(TARGET_datadir)/udhcpc/default.script $(BUSYBOX_INSTALL_LINK_RESOLV_CONF) $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/crond.init $(TARGET_sysconfdir)/init.d/crond diff --git a/skel-root/general/files-etc/network/interfaces b/package/ifupdown-scripts/files/interfaces similarity index 100% rename from skel-root/general/files-etc/network/interfaces rename to package/ifupdown-scripts/files/interfaces diff --git a/skel-root/general/scripts/networking.init b/package/ifupdown-scripts/files/network.init similarity index 100% rename from skel-root/general/scripts/networking.init rename to package/ifupdown-scripts/files/network.init diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk new file mode 100644 index 00000000..6cff8202 --- /dev/null +++ b/package/ifupdown-scripts/ifupdown-scripts.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# ifupdown-scripts +# +################################################################################ + +ifupdown-scripts: | $(TARGET_DIR) + $(INSTALL) -d $(TARGET_sysconfdir)/network/if-{up,pre-up,post-up,down,pre-down,post-down}.d + ifeq ($(PERSISTENT_VAR_PARTITION),yes) + $(INSTALL_DATA) -D $(PKG_FILES_DIR)/interfaces $(TARGET_localstatedir)/etc/network/interfaces + ln -sf /var/etc/network/interfaces $(TARGET_sysconfdir)/network/interfaces + else + $(INSTALL_DATA) -D $(PKG_FILES_DIR)/interfaces $(TARGET_sysconfdir)/network/interfaces + endif + $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/network.init $(TARGET_sysconfdir)/init.d/network + $(UPDATE-RC.D) network stop 98 0 6 . diff --git a/package/sysvinit/files/rcS-hd1 b/package/sysvinit/files/rcS-hd1 index ffdd1f90..6afe2633 100644 --- a/package/sysvinit/files/rcS-hd1 +++ b/package/sysvinit/files/rcS-hd1 @@ -127,7 +127,7 @@ insmod 8192cu.ko insmod rt2870sta.ko # fire up network/wlan -service networking start +service network start service ntpdate start # load rest of modules diff --git a/package/sysvinit/files/rcS-hd2 b/package/sysvinit/files/rcS-hd2 index 79d33a93..a8db7077 100644 --- a/package/sysvinit/files/rcS-hd2 +++ b/package/sysvinit/files/rcS-hd2 @@ -145,7 +145,7 @@ ln -sf /dev/cs_ir /dev/input/nevis_ir ln -sf /dev/cs_ir /dev/input/input0 # fire up network/wlan -service networking start +service network start service ntpdate start # say hi to everyone diff --git a/package/sysvinit/files/rcS-hd5x b/package/sysvinit/files/rcS-hd5x index f82073fd..521333f8 100644 --- a/package/sysvinit/files/rcS-hd5x +++ b/package/sysvinit/files/rcS-hd5x @@ -83,7 +83,7 @@ showiframe.sh bootlogo.m2v service mdev start # fire up network/wlan -service networking start +service network start service ntpdate start # say hi to everyone diff --git a/package/sysvinit/files/rcS-hd6x b/package/sysvinit/files/rcS-hd6x index f82073fd..521333f8 100644 --- a/package/sysvinit/files/rcS-hd6x +++ b/package/sysvinit/files/rcS-hd6x @@ -83,7 +83,7 @@ showiframe.sh bootlogo.m2v service mdev start # fire up network/wlan -service networking start +service network start service ntpdate start # say hi to everyone diff --git a/package/sysvinit/files/rcS-vuduo b/package/sysvinit/files/rcS-vuduo index 6ba4eee7..d1045b5f 100644 --- a/package/sysvinit/files/rcS-vuduo +++ b/package/sysvinit/files/rcS-vuduo @@ -78,7 +78,7 @@ showiframe.sh bootlogo.m2v service mdev start # fire up network/wlan -service networking start +service network start service ntpdate start # say hi to everyone diff --git a/package/sysvinit/files/rcS-vuplus b/package/sysvinit/files/rcS-vuplus index 158fd1a6..25b287cf 100644 --- a/package/sysvinit/files/rcS-vuplus +++ b/package/sysvinit/files/rcS-vuplus @@ -76,7 +76,7 @@ showiframe.sh bootlogo.m2v service mdev start # fire up network/wlan -service networking start +service network start service ntpdate start # say hi to everyone