From 41f42651018420470e57ee4483db06ccad8ec0c6 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 16 Oct 2014 10:30:16 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42931 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/image-config.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 67604cdd54..c679a5b33a 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -217,11 +217,18 @@ menuconfig PER_FEED_REPO 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" -- cgit v1.2.3