From: Felix Fietkau Date: Thu, 16 Jun 2016 09:41:52 +0000 (+0200) Subject: include/feeds.mk: allow installation from feed packages that are installed but no... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4b8ba2b4cefd3e7a6be832d646b01be4ae97f075;p=openwrt%2Fstaging%2Faparcar.git include/feeds.mk: allow installation from feed packages that are installed but no longer in feeds.conf Signed-off-by: Felix Fietkau --- diff --git a/include/feeds.mk b/include/feeds.mk index d0d473983e..9526e34706 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -8,8 +8,8 @@ -include $(TMP_DIR)/.packagesubdirs -FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n) FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) +FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n)) FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed))) FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))