From 3c4d17ed4352339cff4ebcee68e88a0752571449 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 6 Aug 2014 09:12:31 +0000 Subject: [PATCH] include: fix detection of installed feeds Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42003 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/feeds.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/feeds.mk b/include/feeds.mk index 17ce64f83a..97b14491f0 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -8,8 +8,9 @@ -include $(TMP_DIR)/.packagefeeds FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n) -FEEDS_INSTALLED:=$(patsubst %.index,%,$(notdir $(wildcard $(TOPDIR)/feeds/*.index))) +FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed))) +FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_INSTALLED)) PKG_CONFIG_DEPENDS += \ CONFIG_PER_FEED_REPO \ -- 2.11.0