topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- move ifupdown-scripts to package dir

master
vanhofen 4 years ago
parent
8737650b40
commit
15b46d0e24
14 changed files with 25 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 1
      make/buildsystem-bootstrap.mk
  3. 9
      make/target-files.mk
  4. 5
      make/target-scripts.mk
  5. 1
      make/target-tools.mk
  6. 0
      package/ifupdown-scripts/files/interfaces
  7. 0
      package/ifupdown-scripts/files/network.init
  8. 16
      package/ifupdown-scripts/ifupdown-scripts.mk
  9. 2
      package/sysvinit/files/rcS-hd1
  10. 2
      package/sysvinit/files/rcS-hd2
  11. 2
      package/sysvinit/files/rcS-hd5x
  12. 2
      package/sysvinit/files/rcS-hd6x
  13. 2
      package/sysvinit/files/rcS-vuduo
  14. 2
      package/sysvinit/files/rcS-vuplus

2
Makefile
View File

@ -209,6 +209,8 @@ include make/target-tools.mk
include make/target-tools-unused.mk include make/target-tools-unused.mk
include make/host-tools.mk include make/host-tools.mk
include $(sort $(wildcard package/*/*.mk))
include make/ni.mk include make/ni.mk
# for your local extensions, e.g. special plugins or similar ... # for your local extensions, e.g. special plugins or similar ...

1
make/buildsystem-bootstrap.mk
View File

@ -46,7 +46,6 @@ target-dir:
mkdir -p $(TARGET_sbindir) mkdir -p $(TARGET_sbindir)
mkdir -p $(TARGET_datadir) mkdir -p $(TARGET_datadir)
#mkdir -p $(TARGET_prefix)/local/{bin,include,lib,sbin,share} #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)/bin
mkdir -p $(TARGET_localstatedir)/etc/init.d mkdir -p $(TARGET_localstatedir)/etc/init.d
mkdir -p $(TARGET_localstatedir)/keys mkdir -p $(TARGET_localstatedir)/keys

9
make/target-files.mk
View File

@ -4,7 +4,6 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
files-etc: \ files-etc: \
$(TARGET_sysconfdir)/network/interfaces \
$(TARGET_sysconfdir)/date-dummy \ $(TARGET_sysconfdir)/date-dummy \
$(TARGET_sysconfdir)/filesystems \ $(TARGET_sysconfdir)/filesystems \
$(TARGET_sysconfdir)/fstab \ $(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: $(TARGET_sysconfdir)/date-dummy:
echo "$(shell date +%Y)01010000" > $(@) echo "$(shell date +%Y)01010000" > $(@)

5
make/target-scripts.mk
View File

@ -13,7 +13,6 @@ init-scripts: \
$(TARGET_sysconfdir)/init.d/custom-poweroff \ $(TARGET_sysconfdir)/init.d/custom-poweroff \
$(TARGET_sysconfdir)/init.d/fstab \ $(TARGET_sysconfdir)/init.d/fstab \
$(TARGET_sysconfdir)/init.d/hostname \ $(TARGET_sysconfdir)/init.d/hostname \
$(TARGET_sysconfdir)/init.d/networking \
$(TARGET_sysconfdir)/init.d/partitions-by-name \ $(TARGET_sysconfdir)/init.d/partitions-by-name \
$(TARGET_sysconfdir)/init.d/proc \ $(TARGET_sysconfdir)/init.d/proc \
$(TARGET_sysconfdir)/init.d/rc.local \ $(TARGET_sysconfdir)/init.d/rc.local \
@ -59,10 +58,6 @@ $(TARGET_sysconfdir)/init.d/fstab:
$(TARGET_sysconfdir)/init.d/hostname: $(TARGET_sysconfdir)/init.d/hostname:
$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/hostname.init $(@) $(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: $(TARGET_sysconfdir)/init.d/partitions-by-name:
ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61))
$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@)

1
make/target-tools.mk
View File

@ -132,6 +132,7 @@ endif
define BUSYBOX_INSTALL_FILES define BUSYBOX_INSTALL_FILES
$(BUSYBOX_INSTALL_SWAP) $(BUSYBOX_INSTALL_SWAP)
$(BUSYBOX_INSTALL_FBSET) $(BUSYBOX_INSTALL_FBSET)
$(MAKE) ifupdown-scripts
$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/udhcpc-default.script $(TARGET_datadir)/udhcpc/default.script $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/udhcpc-default.script $(TARGET_datadir)/udhcpc/default.script
$(BUSYBOX_INSTALL_LINK_RESOLV_CONF) $(BUSYBOX_INSTALL_LINK_RESOLV_CONF)
$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/crond.init $(TARGET_sysconfdir)/init.d/crond $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/crond.init $(TARGET_sysconfdir)/init.d/crond

0
skel-root/general/files-etc/network/interfaces → package/ifupdown-scripts/files/interfaces
View File

0
skel-root/general/scripts/networking.init → package/ifupdown-scripts/files/network.init
View File

16
package/ifupdown-scripts/ifupdown-scripts.mk
View File

@ -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 .

2
package/sysvinit/files/rcS-hd1
View File

@ -127,7 +127,7 @@ insmod 8192cu.ko
insmod rt2870sta.ko insmod rt2870sta.ko
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# load rest of modules # load rest of modules

2
package/sysvinit/files/rcS-hd2
View File

@ -145,7 +145,7 @@ ln -sf /dev/cs_ir /dev/input/nevis_ir
ln -sf /dev/cs_ir /dev/input/input0 ln -sf /dev/cs_ir /dev/input/input0
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# say hi to everyone # say hi to everyone

2
package/sysvinit/files/rcS-hd5x
View File

@ -83,7 +83,7 @@ showiframe.sh bootlogo.m2v
service mdev start service mdev start
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# say hi to everyone # say hi to everyone

2
package/sysvinit/files/rcS-hd6x
View File

@ -83,7 +83,7 @@ showiframe.sh bootlogo.m2v
service mdev start service mdev start
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# say hi to everyone # say hi to everyone

2
package/sysvinit/files/rcS-vuduo
View File

@ -78,7 +78,7 @@ showiframe.sh bootlogo.m2v
service mdev start service mdev start
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# say hi to everyone # say hi to everyone

2
package/sysvinit/files/rcS-vuplus
View File

@ -76,7 +76,7 @@ showiframe.sh bootlogo.m2v
service mdev start service mdev start
# fire up network/wlan # fire up network/wlan
service networking start service network start
service ntpdate start service ntpdate start
# say hi to everyone # say hi to everyone

Write Preview
Loading…
Cancel
Save