aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-08-06 09:12:31 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-08-06 09:12:31 +0000
commite1258f984ac16f84182e0d4202258d89483bfe0d (patch)
tree85d49429d9803294479de3428b6e108043729672 /include
parenta720dd209f8b345cdfa5d2432287520389404445 (diff)
downloadupstream-e1258f984ac16f84182e0d4202258d89483bfe0d.tar.gz
upstream-e1258f984ac16f84182e0d4202258d89483bfe0d.tar.bz2
upstream-e1258f984ac16f84182e0d4202258d89483bfe0d.zip
include: fix detection of installed feeds
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 42003
Diffstat (limited to 'include')
-rw-r--r--include/feeds.mk3
1 files changed, 2 insertions, 1 deletions
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 \