base-files: sysupgrade: allow overriding config restore

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index af5c0e6b004704b4094264bd9228703bb1b8b29b..67fc5d29c1d764c47fdf6cc7420b5ae72935fa23 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))
@@ -88,12 +89,28 @@ define ImageConfigOptions
        echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
        echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
        echo 'pi_preinit_no_failsafe="$(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE)"' >>$(1)/lib/preinit/00_preinit.conf
+ifeq ($(CONFIG_TARGET_DEFAULT_LAN_IP_FROM_PREINIT),y)
+       mkdir -p $(1)/etc/board.d
+       echo '. /lib/functions/uci-defaults.sh' >$(1)/etc/board.d/99-lan-ip
+       echo 'logger -t 99-lan-ip "setting custom default LAN IP"' >>$(1)/etc/board.d/99-lan-ip
+       echo 'board_config_update' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_select network' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_select lan' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_add_string ipaddr $(if $(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),"192.168.1.1")' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_add_string netmask $(if $(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),"255.255.255.0")' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_select ..' >>$(1)/etc/board.d/99-lan-ip
+       echo 'json_select ..' >>$(1)/etc/board.d/99-lan-ip
+       echo 'board_config_flush' >>$(1)/etc/board.d/99-lan-ip
+endif
 endef
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef
 
+define Build/Quilt
+endef
+
 define Build/Compile/Default
 
 endef
@@ -124,6 +141,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 +159,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
@@ -175,7 +199,8 @@ define Package/base-files/install
                $(1)/usr/lib \
                $(1)/usr/bin \
                $(1)/sys \
-               $(1)/www \
+               $(1)/www
+       mkdir -p -m 750 \
                $(1)/root
 
        $(LN) /proc/mounts $(1)/etc/mtab