build: improve feed handling for opkg.conf

[openwrt/staging/lynxis.git] / package / base-files / image-config.in

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index d745369a2c71e6ddacea84c1d36de0d7860f24fa..c679a5b33a9f4fe8d3390458cf5128e4847c370a 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -211,11 +211,25 @@ endif
 
 menuconfig PER_FEED_REPO
        bool "Separate feed repositories" if IMAGEOPT
-       default n
+       default y
        help
                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 available but not enabled feeds to opkg.conf"
+               default y
+               depends on PER_FEED_REPO
+               help
+                 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"