[source] package: move distfeeds.conf from opkg to base-files

[LEDE Commits]

jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/1cfbd50ff4d401023748c9834845898618e72221

commit 1cfbd50ff4d401023748c9834845898618e72221
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Tue Dec 12 11:19:07 2017 +0100

    package: move distfeeds.conf from opkg to base-files
    
    All the relevant options used for distfeeds.conf are part of base-files,
    so it makes more sense to move the file there as well.
    
    This has the added benefit that the we can share the opkg package again,
    reducing the amount of target specific packages.
    
    Acked-by: Jo-Philipp Wich <jo at mein.io>
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
 package/base-files/Makefile  | 12 ++++++++++--
 package/system/opkg/Makefile | 14 ++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5afb02d..6e8ef58 100644
--- 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:=178
+PKG_RELEASE:=179
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -21,7 +22,11 @@ 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_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
 
@@ -184,6 +189,9 @@ 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)
+
+	$(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf)
+	$(VERSION_SED) $(1)/etc/opkg/distfeeds.conf
 endef
 
 ifneq ($(DUMP),1)
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index a49021b..7b49a3b 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -7,11 +7,9 @@
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/version.mk
-include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=opkg
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_FLAGS:=essential
 
 PKG_SOURCE_PROTO:=git
@@ -25,15 +23,9 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo at mein.io>
 
-PKG_FLAGS := nonshared
-
 PKG_CONFIG_DEPENDS := \
 	CONFIG_SIGNED_PACKAGES \
-	CONFIG_TARGET_INIT_PATH \
-	CONFIG_PER_FEED_REPO \
-	CONFIG_PER_FEED_REPO_ADD_DISABLED \
-	CONFIG_PER_FEED_REPO_ADD_COMMENTED \
-	$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
+	CONFIG_TARGET_INIT_PATH
 
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1
@@ -93,8 +85,6 @@ define Package/opkg/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/customfeeds.conf $(1)/etc/opkg/customfeeds.conf
 	$(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf
-	$(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf)
-	$(VERSION_SED) $(1)/etc/opkg/distfeeds.conf
 	$(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
   ifneq ($(CONFIG_SIGNED_PACKAGES),)