From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 6 Aug 2014 18:18:48 +0000 (+0000)
Subject: include: fix detection of installed feeds
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=05528edc7522fa01be0f5efad4aa96794a4ea7f9;p=14.07%2Fopenwrt.git

include: fix detection of installed feeds

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Backport of r42003

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42017 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/feeds.mk b/include/feeds.mk
index 17ce64f..97b1449 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 \