From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 6 Aug 2014 09:12:31 +0000 (+0000)
Subject: include: fix detection of installed feeds
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=commitdiff_plain;h=e1258f984ac16f84182e0d4202258d89483bfe0d;ds=sidebyside

include: fix detection of installed feeds

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

SVN-Revision: 42003
---

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 \