Browse Source

Revert "- environment-target.mk: introduce PERSISTENT_VAR_PARTITION variable"

This reverts commit 2055f372ab.
master
Knicko007 5 years ago
parent
commit
b9ee865a80
  1. 2
      make/bootstrap.mk
  2. 4
      make/environment-target.mk
  3. 2
      make/image-updates.mk
  4. 2
      make/target-rootfs.mk

2
make/bootstrap.mk

@ -59,7 +59,7 @@ endif
mkdir -p $(TARGET_DIR)/var/spool/cron/crontabs mkdir -p $(TARGET_DIR)/var/spool/cron/crontabs
mkdir -p $(PKG_CONFIG_PATH) mkdir -p $(PKG_CONFIG_PATH)
make skeleton make skeleton
ifeq ($(PERSISTENT_VAR_PARTITION), yes) ifeq ($(BOXSERIES), hd2)
ifeq ($(IMAGE_NEW), yes) ifeq ($(IMAGE_NEW), yes)
touch -f $(TARGET_DIR)/var/etc/.newimage touch -f $(TARGET_DIR)/var/etc/.newimage
endif endif

4
make/environment-target.mk

@ -62,7 +62,3 @@ remove-man2dir = $(remove-mandir)/man2
# ca-certificates # ca-certificates
CA-BUNDLE = ca-certificates.crt CA-BUNDLE = ca-certificates.crt
CA-BUNDLE_DIR = /etc/ssl/certs CA-BUNDLE_DIR = /etc/ssl/certs
# -----------------------------------------------------------------------------
PERSISTENT_VAR_PARTITION = $(if $(filter $(BOXMODEL), apollo shiner kronos kronos_v2), yes, no)

2
make/image-updates.mk

@ -58,7 +58,7 @@ u-neutrino-full: neutrino-clean
ifneq ($(DEBUG), yes) ifneq ($(DEBUG), yes)
find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
endif endif
ifeq ($(PERSISTENT_VAR_PARTITION), yes) ifeq ($(BOXSERIES), hd2)
# avoid overrides in user's var-partition # avoid overrides in user's var-partition
mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init
endif endif

2
make/target-rootfs.mk

@ -50,7 +50,7 @@ endif
rm -rf tmp; ln -sf /tmp tmp rm -rf tmp; ln -sf /tmp tmp
$(CD) $(TARGET_DIR)/etc; \ $(CD) $(TARGET_DIR)/etc; \
ln -sf /proc/mounts mtab ln -sf /proc/mounts mtab
ifeq ($(PERSISTENT_VAR_PARTITION), yes) ifeq ($(BOXSERIES), hd2)
$(CD) $(TARGET_DIR)/etc; \ $(CD) $(TARGET_DIR)/etc; \
ln -sf /var/etc/exports exports; \ ln -sf /var/etc/exports exports; \
ln -sf /var/etc/fstab fstab; \ ln -sf /var/etc/fstab fstab; \

Loading…
Cancel
Save