Author: blogic Date: 2014-08-06 20:18:49 +0200 (Wed, 06 Aug 2014) New Revision: 42018
Modified: branches/barrier_breaker/package/base-files/image-config.in branches/barrier_breaker/package/system/opkg/Makefile Log: build: add new option to add disabled feeds commented out to opkg.conf Signed-off-by: Jo-Philipp Wich <[email protected]> Backport of r42004 Modified: branches/barrier_breaker/package/base-files/image-config.in =================================================================== --- branches/barrier_breaker/package/base-files/image-config.in 2014-08-06 18:18:48 UTC (rev 42017) +++ branches/barrier_breaker/package/base-files/image-config.in 2014-08-06 18:18:49 UTC (rev 42018) @@ -216,6 +216,13 @@ If set, a separate repository is generated within bin/*/packages/ for the core packages and each enabled feed. + config PER_FEED_REPO_ADD_DISABLED + bool "Add installed but disabled 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. + source "tmp/.config-feeds.in" Modified: branches/barrier_breaker/package/system/opkg/Makefile =================================================================== --- branches/barrier_breaker/package/system/opkg/Makefile 2014-08-06 18:18:48 UTC (rev 42017) +++ branches/barrier_breaker/package/system/opkg/Makefile 2014-08-06 18:18:49 UTC (rev 42018) @@ -111,6 +111,11 @@ for d in base $(FEEDS_ENABLED); do \ echo "src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ 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; \ + done + endif endif $(VERSION_SED) $(1)/etc/opkg.conf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
