odhcp6c: support multiple additional user prefixes

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f8976263b9437bdc38466e6a9ec0b0502938f6b0..ab21213b51f866223e37aaffa58c6b9c1ee82ae5 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,9 +9,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
+include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=174
+PKG_RELEASE:=184
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -21,7 +22,12 @@ PKG_LICENSE:=GPL-2.0
 # Extend depends from version.mk
 PKG_CONFIG_DEPENDS += \
        CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \
-       CONFIG_NAND_SUPPORT
+       CONFIG_NAND_SUPPORT \
+       CONFIG_CLEAN_IPKG \
+       CONFIG_PER_FEED_REPO \
+       CONFIG_PER_FEED_REPO_ADD_DISABLED \
+       CONFIG_PER_FEED_REPO_ADD_COMMENTED \
+       $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,7 +40,7 @@ define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
   DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
-  TITLE:=Base filesystem for Lede
+  TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
@@ -52,6 +58,7 @@ define Package/base-files/conffiles
 /etc/iproute2/rt_tables
 /etc/passwd
 /etc/profile
+/etc/profile.d
 /etc/protocols
 /etc/rc.local
 /etc/services
@@ -130,7 +137,7 @@ define Package/base-files/install
                fi; \
        )
 
-       $(VERSION_SED) \
+       $(VERSION_SED_SCRIPT) \
                $(1)/etc/banner \
                $(1)/etc/openwrt_version \
                $(1)/usr/lib/os-release
@@ -147,6 +154,7 @@ define Package/base-files/install
 
        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
@@ -182,6 +190,11 @@ define Package/base-files/install
        $(if $(CONFIG_INCLUDE_CONFIG), \
                echo -e "# Build configuration for board $(BOARD)/$(SUBTARGET)/$(PROFILE)\n" >$(1)/etc/build.config; \
                cat $(BIN_DIR)/config.seed >>$(1)/etc/build.config)
+
+       $(if $(CONFIG_CLEAN_IPKG),, \
+               mkdir -p $(1)/etc/opkg; \
+               $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \
+               $(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
 endef
 
 ifneq ($(DUMP),1)