Author: blogic
Date: 2014-08-06 20:18:48 +0200 (Wed, 06 Aug 2014)
New Revision: 42017

Modified:
   branches/barrier_breaker/include/feeds.mk
Log:
include: fix detection of installed feeds

Signed-off-by: Jo-Philipp Wich <[email protected]>

Backport of r42003

Modified: branches/barrier_breaker/include/feeds.mk
===================================================================
--- branches/barrier_breaker/include/feeds.mk   2014-08-06 18:18:47 UTC (rev 
42016)
+++ branches/barrier_breaker/include/feeds.mk   2014-08-06 18:18:48 UTC (rev 
42017)
@@ -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 \
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to