From: Matthias Schiffer Date: Mon, 16 Jan 2017 08:11:56 +0000 (+0100) Subject: include/feeds.mk: base list of enabled feeds on available instead of installed feeds X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9c55dede26aa488a9010eae4aa2b9d9b29b3fb2f;p=openwrt%2Fstaging%2Fadrian.git include/feeds.mk: base list of enabled feeds on available instead of installed feeds This fixes handling of CONFIG_FEED_* options for uninstalled feeds. Signed-off-by: Matthias Schiffer --- diff --git a/include/feeds.mk b/include/feeds.mk index 2ff57e5762..054b5aa796 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -10,7 +10,7 @@ FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n)) -FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed))) +FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed))) FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE)) PACKAGE_SUBDIRS=$(PACKAGE_DIR)