diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-07-10 00:00:01 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-07-12 21:26:42 +0200 |
| commit | 514a4b3e1b4e42fa796d1c908259ee9e215a77da (patch) | |
| tree | d6d8d2720a5c7eebd2be5d36f8db2b66bf02fe2f /include | |
| parent | 3e89f58a5ead1511f594704951946a79fc0b79d7 (diff) | |
| download | upstream-514a4b3e1b4e42fa796d1c908259ee9e215a77da.tar.gz upstream-514a4b3e1b4e42fa796d1c908259ee9e215a77da.tar.bz2 upstream-514a4b3e1b4e42fa796d1c908259ee9e215a77da.zip | |
include/feeds.mk: rework generation of opkg distfeeds.conf
Allow enabling/commenting/disabling each feed individually by using a
tristate config symbol.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 16035a7dd370671670693af9ae63368ee4dd731f)
Diffstat (limited to 'include')
| -rw-r--r-- | include/feeds.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/feeds.mk b/include/feeds.mk index c9ffa95a36..3e0801e656 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -10,8 +10,6 @@ FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n)) -FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed))) -FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE)) PACKAGE_SUBDIRS=$(PACKAGE_DIR) ifneq ($(CONFIG_PER_FEED_REPO),) @@ -35,10 +33,11 @@ endef # 1: destination file define FeedSourcesAppend ( \ - echo "src/gz %d_core %U/targets/%S/packages"; \ + echo 'src/gz %d_core %U/targets/%S/packages'; \ + echo 'src/gz %d_base %U/packages/%A/base'; \ $(strip $(if $(CONFIG_PER_FEED_REPO), \ - $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \ - $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \ - $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \ + $(foreach feed,$(FEEDS_AVAILABLE), \ + $(if $(CONFIG_FEED_$(feed)), \ + echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/%A/$(feed)';)))) \ ) >> $(1) endef |