Browse Source

- move some PERSISTENT_VAR_PARTITION links directly to the targets

master
vanhofen 4 years ago
parent
commit
54f14a1532
  1. 2
      make/target-files.mk
  2. 4
      make/target-rootfs.mk
  3. 3
      make/target-tools.mk

2
make/target-files.mk

@ -30,6 +30,7 @@ $(TARGET_sysconfdir)/default/rcS:
$(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
@ -58,6 +59,7 @@ $(TARGET_sysconfdir)/nsswitch.conf:
$(TARGET_sysconfdir)/passwd:
ifeq ($(PERSISTENT_VAR_PARTITION),yes)
$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(TARGET_localstatedir)/etc/passwd
ln -sf /var/etc/passwd $(@)
else
$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(@)
endif

4
make/target-rootfs.mk

@ -48,11 +48,7 @@ symbolic-links: | $(TARGET_DIR)
ifeq ($(PERSISTENT_VAR_PARTITION),yes)
$(CD) $(TARGET_sysconfdir); \
ln -sf /var/etc/hostname hostname; \
ln -sf /var/etc/localtime localtime; \
ln -sf /var/etc/passwd passwd; \
ln -sf /var/etc/resolv.conf resolv.conf
$(CD) $(TARGET_sysconfdir)/network; \
ln -sf /var/etc/network/interfaces interfaces
endif
mkdir -p $(TARGET_localstatedir)/tuxbox/config
$(CD) $(TARGET_localstatedir)/tuxbox/config; \

3
make/target-tools.mk

@ -856,6 +856,9 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR)
done; \
$(INSTALL_DATA) -D $(PKG_FILES_DIR)/timezone.xml $(TARGET_sysconfdir)/timezone.xml
ln -sf $(datadir)/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)$(ETC_LOCALTIME)
ifeq ($(PERSISTENT_VAR_PARTITION),yes)
ln -sf $(ETC_LOCALTIME) $(TARGET_sysconfdir)/localtime
endif
echo "$(TZDATA_LOCALTIME)" > $(TARGET_sysconfdir)/timezone
$(REMOVE)/$(PKG_DIR)
$(TOUCH)

Loading…
Cancel
Save