Author: jow Date: 2014-10-16 12:30:16 +0200 (Thu, 16 Oct 2014) New Revision: 42931
Modified: trunk/include/feeds.mk trunk/package/base-files/image-config.in trunk/package/system/opkg/Makefile Log: build: improve feed handling for opkg.conf - Consider not installed feeds as well - Add option to decide whether to comment disabled feeds Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/include/feeds.mk =================================================================== --- trunk/include/feeds.mk 2014-10-16 08:34:38 UTC (rev 42930) +++ trunk/include/feeds.mk 2014-10-16 10:30:16 UTC (rev 42931) @@ -10,10 +10,12 @@ FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n) 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)) +FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE)) PKG_CONFIG_DEPENDS += \ CONFIG_PER_FEED_REPO \ + CONFIG_PER_FEED_REPO_ADD_DISABLED \ + CONFIG_PER_FEED_REPO_ADD_COMMENTED \ $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed)) # 1: package name Modified: trunk/package/base-files/image-config.in =================================================================== --- trunk/package/base-files/image-config.in 2014-10-16 08:34:38 UTC (rev 42930) +++ trunk/package/base-files/image-config.in 2014-10-16 10:30:16 UTC (rev 42931) @@ -217,12 +217,19 @@ for the core packages and each enabled feed. config PER_FEED_REPO_ADD_DISABLED - bool "Add installed but disabled feeds to opkg.conf" + bool "Add available but not enabled feeds to opkg.conf" default y depends on PER_FEED_REPO help - Add installed but disabled feeds as commented out source lines to opkg.conf. + Add not installed or disabled feeds from feeds.conf to opkg.conf. + config PER_FEED_REPO_ADD_COMMENTED + bool "Comment out not enabled feeds" + default y + depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED + help + Add not enabled feeds as commented out source lines to opkg.conf. + source "tmp/.config-feeds.in" Modified: trunk/package/system/opkg/Makefile =================================================================== --- trunk/package/system/opkg/Makefile 2014-10-16 08:34:38 UTC (rev 42930) +++ trunk/package/system/opkg/Makefile 2014-10-16 10:30:16 UTC (rev 42931) @@ -113,7 +113,7 @@ done ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) for d in $(FEEDS_DISABLED); do \ - echo "# src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ + echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ done endif endif _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
