[source] include/feeds.mk: base list of enabled feeds on available instead of installed feeds

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 16 00:14:32 PST 2017


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/9c55dede26aa488a9010eae4aa2b9d9b29b3fb2f

commit 9c55dede26aa488a9010eae4aa2b9d9b29b3fb2f
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Mon Jan 16 09:11:56 2017 +0100

    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 <mschiffer at universe-factory.net>
---
 include/feeds.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/feeds.mk b/include/feeds.mk
index 2ff57e5..054b5aa 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)



More information about the lede-commits mailing list