base-files: simplify restorecon logic

[openwrt/openwrt.git] / package / base-files / Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 58ad08c63a082b0b3812cb2e5a249f1e1932c1c7..914f0598ff9c181952f20f769e64d2b1121b6ae2 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -24,6 +24,7 @@ PKG_CONFIG_DEPENDS += \
        CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \
        CONFIG_NAND_SUPPORT \
        CONFIG_LEGACY_SDCARD_SUPPORT \
+       CONFIG_EMMC_SUPPORT \
        CONFIG_CLEAN_IPKG \
        CONFIG_PER_FEED_REPO \
        $(foreach feed,$(FEEDS_AVAILABLE),CONFIG_FEED_$(feed))
@@ -124,6 +125,12 @@ ifeq ($(CONFIG_NAND_SUPPORT),)
   endef
 endif
 
+ifeq ($(CONFIG_EMMC_SUPPORT),)
+  define Package/base-files/emmc-support
+       rm -f $(1)/lib/upgrade/emmc.sh
+  endef
+endif
+
 ifeq ($(CONFIG_LEGACY_SDCARD_SUPPORT),)
   define Package/base-files/legacy-sdcard-support
        rm -f $(1)/lib/upgrade/legacy-sdcard.sh
@@ -136,6 +143,7 @@ define Package/base-files/install
        $(Package/base-files/install-key)
        $(Package/base-files/nand-support)
        $(Package/base-files/legacy-sdcard-support)
+       $(Package/base-files/emmc-support)
        if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
        fi
@@ -150,37 +158,38 @@ define Package/base-files/install
 
        $(VERSION_SED_SCRIPT) \
                $(1)/etc/banner \
+               $(1)/etc/device_info \
+               $(1)/etc/openwrt_release \
                $(1)/etc/openwrt_version \
                $(1)/usr/lib/os-release
 
-       $(VERSION_SED_SCRIPT) \
-               $(1)/etc/openwrt_release \
-               $(1)/etc/device_info \
-               $(1)/usr/lib/os-release
 
        $(SED) "s#%PATH%#$(TARGET_INIT_PATH)#g" \
                $(1)/sbin/hotplug-call \
                $(1)/etc/preinit \
                $(1)/etc/profile
 
-       mkdir -p $(1)/CONTROL
-       mkdir -p $(1)/dev
-       mkdir -p $(1)/etc/config
-       mkdir -p $(1)/etc/crontabs
-       mkdir -p $(1)/etc/rc.d
-       mkdir -p $(1)/overlay
-       mkdir -p $(1)/lib/firmware
+       mkdir -p \
+               $(1)/CONTROL \
+               $(1)/dev \
+               $(1)/etc/config \
+               $(1)/etc/crontabs \
+               $(1)/etc/rc.d \
+               $(1)/overlay \
+               $(1)/lib/firmware \
+               $(1)/mnt \
+               $(1)/proc \
+               $(1)/tmp \
+               $(1)/usr/lib \
+               $(1)/usr/bin \
+               $(1)/sys \
+               $(1)/www \
+               $(1)/root
+
+       $(LN) /proc/mounts $(1)/etc/mtab
        $(if $(LIB_SUFFIX),-$(LN) lib $(1)/lib$(LIB_SUFFIX))
-       mkdir -p $(1)/mnt
-       mkdir -p $(1)/proc
-       mkdir -p $(1)/tmp
-       mkdir -p $(1)/usr/lib
        $(if $(LIB_SUFFIX),-$(LN) lib $(1)/usr/lib$(LIB_SUFFIX))
-       mkdir -p $(1)/usr/bin
-       mkdir -p $(1)/sys
-       mkdir -p $(1)/www
-       mkdir -p $(1)/root
-       $(LN) /proc/mounts $(1)/etc/mtab
+
 ifneq ($(CONFIG_TARGET_ROOTFS_PERSIST_VAR),y)
        rm -f $(1)/var
        $(LN) tmp $(1)/var
@@ -188,7 +197,6 @@ else
        mkdir -p $(1)/var
        $(LN) /tmp/run $(1)/var/run
 endif
-       mkdir -p $(1)/etc
        $(LN) /tmp/resolv.conf /tmp/TZ /tmp/localtime $(1)/etc/
 
        chmod 0600 $(1)/etc/shadow