From 960b7643c9a65124b13a478c49a8a89848391edb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 6 Aug 2014 09:12:37 +0000 Subject: [PATCH] build: add new option to add disabled feeds commented out to opkg.conf Signed-off-by: Jo-Philipp Wich SVN-Revision: 42004 --- package/base-files/image-config.in | 7 +++++++ package/system/opkg/Makefile | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index d745369a2c..3029648d85 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -216,6 +216,13 @@ menuconfig PER_FEED_REPO 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" diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 5dfabc2ca2..8a63fb4352 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -111,6 +111,11 @@ define Package/opkg/Default/install 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 -- 2.25.1