diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2015-02-13 11:59:16 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-02-13 11:59:16 +0000 |
commit | cd30f34da529d0d80782c0e5dccd50bba656f8aa (patch) | |
tree | 6fdf8ad410aa8feb8934239d6c1dba84f2f3bef2 /package/base-files/image-config.in | |
parent | 4a54acf279d44111a46129ca3f08a68e41a18b04 (diff) | |
download | upstream-cd30f34da529d0d80782c0e5dccd50bba656f8aa.tar.gz upstream-cd30f34da529d0d80782c0e5dccd50bba656f8aa.tar.bz2 upstream-cd30f34da529d0d80782c0e5dccd50bba656f8aa.zip |
BB: 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 <jow@openwrt.org>
Backport of r42931
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44441 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/image-config.in')
-rw-r--r-- | package/base-files/image-config.in | 11 |
1 files changed, 9 insertions, 2 deletions
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" |