Kaynağa Gözat

build: move PKG_CONFIG_DEPENDS from feeds.mk to opkg

Normal packages don't rely on the feed configuration variables for the
build step

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 8 yıl önce
ebeveyn
işleme
6411a12de2
2 değiştirilmiş dosya ile 8 ekleme ve 7 silme
  1. 0 6
      include/feeds.mk
  2. 8 1
      package/system/opkg/Makefile

+ 0 - 6
include/feeds.mk

@@ -29,12 +29,6 @@ opkg_package_files = $(wildcard \
 	$(foreach dir,$(PACKAGE_SUBDIRS), \
 	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
 
-PKG_CONFIG_DEPENDS += \
-	CONFIG_PER_FEED_REPO \
-	CONFIG_PER_FEED_REPO_ADD_DISABLED \
-	CONFIG_PER_FEED_REPO_ADD_COMMENTED \
-	$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
-
 # 1: package name
 define FeedPackageDir
 $(strip $(if $(CONFIG_PER_FEED_REPO), \

+ 8 - 1
package/system/opkg/Makefile

@@ -26,7 +26,14 @@ PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
 
 PKG_FLAGS := nonshared
-PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH
+
+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))
 
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1