From 6411a12de2c783bc8882f43d593d9fa63f9b0759 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 27 Mar 2017 10:21:24 +0200 Subject: [PATCH] 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 --- include/feeds.mk | 6 ------ package/system/opkg/Makefile | 9 ++++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/feeds.mk b/include/feeds.mk index 054b5aa796..f89687a27e 100644 --- a/include/feeds.mk +++ b/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), \ diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 3bd2a034e9..132721d518 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -26,7 +26,14 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jo-Philipp Wich 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 -- 2.30.2