build: add version number to filenames

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

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 3029648d85bb4aa39eb240bd0f7f159b5cbe66d5..1f0b2c86ea09c7db8c4edf4d4b646e5b8022c543 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -18,11 +18,11 @@ config TARGET_PREINIT_SUPPRESS_STDERR
        default y
        help
                Sends stderr to null during preinit.  This is the default behaviour
-               in previous versions of OpenWRT.  This also prevents init process
+               in previous versions of OpenWrt.  This also prevents init process
                itself from displaying stderr, however processes launched by init
                in multiuser through inittab will use the current terminal (e.g.
                the ash shell launched by inittab will display stderr).  That's
-               the same behaviour as seen in previous version of OpenWRT.
+               the same behaviour as seen in previous version of OpenWrt.
 
 config TARGET_PREINIT_TIMEOUT
        int
@@ -128,7 +128,7 @@ menuconfig INITOPT
                help
                        Prevents showing stderr messages for init command if not already
                        suppressed during preinit.  This is the default behaviour in
-                       previous versions of OpenWRT.  Removing this does nothing if
+                       previous versions of OpenWrt.  Removing this does nothing if
                        stderr is suppressed during preinit (which is the default).
 
 
@@ -206,22 +206,37 @@ if VERSIONOPT
                help
                        This is the hardware revision string embedded in /etc/device_info
                        Useful for OEMs building OpenWrt based firmware
+
+       config VERSION_FILENAMES
+               bool
+               prompt "Version number in filenames"
+               default y
+               help
+                       Enable this to include the version number in firmware image, SDK-
+                       and Image Builder archive file names
 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 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"