projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ee6c17
)
include/feeds.mk: allow installation from feed packages that are installed but no...
author
Felix Fietkau
<
[email protected]
>
Thu, 16 Jun 2016 09:41:52 +0000
(11:41 +0200)
committer
Felix Fietkau
<
[email protected]
>
Thu, 16 Jun 2016 09:56:24 +0000
(11:56 +0200)
Signed-off-by: Felix Fietkau <
[email protected]
>
include/feeds.mk
patch
|
blob
|
history
diff --git
a/include/feeds.mk
b/include/feeds.mk
index d0d473983e653e76b594113ef952eaa568a41155..9526e347062dfb731349413b7f23093eb13e7495 100644
(file)
--- 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))