Skip to content
Snippets Groups Projects
Commit 6411a12d authored by Felix Fietkau's avatar Felix Fietkau
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
parent 7fe5963b
No related branches found
No related tags found
No related merge requests found
...@@ -29,12 +29,6 @@ opkg_package_files = $(wildcard \ ...@@ -29,12 +29,6 @@ opkg_package_files = $(wildcard \
$(foreach dir,$(PACKAGE_SUBDIRS), \ $(foreach dir,$(PACKAGE_SUBDIRS), \
$(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk))) $(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 # 1: package name
define FeedPackageDir define FeedPackageDir
$(strip $(if $(CONFIG_PER_FEED_REPO), \ $(strip $(if $(CONFIG_PER_FEED_REPO), \
......
...@@ -26,7 +26,14 @@ PKG_LICENSE_FILES:=COPYING ...@@ -26,7 +26,14 @@ PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_FLAGS := nonshared 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 PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment