build: use SNAPSHOT instead of CURRENT to designate untagged branch builds

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

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 5f84d115e53f7a02f8944e0fb19b5eba7b2157b6..a8d82d3e0cfb9560d227e29a4671a8ecc9f68b13 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -24,13 +24,24 @@ config TARGET_PREINIT_SUPPRESS_STDERR
                the ash shell launched by inittab will display stderr).  That's
                the same behaviour as seen in previous version of OpenWrt.
 
                the ash shell launched by inittab will display stderr).  That's
                the same behaviour as seen in previous version of OpenWrt.
 

+config TARGET_PREINIT_DISABLE_FAILSAFE
+       bool
+       prompt "Disable failsafe" if PREINITOPT
+       default n
+       help
+               Disable failsafe mode.  While it is very handy while
+               experimenting or developing it really ought to be
+               disabled in production environments as it is a major
+               security loophole.
+

 config TARGET_PREINIT_TIMEOUT
        int
 config TARGET_PREINIT_TIMEOUT
        int

-       prompt "Failsafe wait timeout" if PREINITOPT
+       prompt "Failsafe/Debug wait timeout" if PREINITOPT

        default 2
        help
        default 2
        help

-               How long to wait for failsafe mode to be entered before
-               continuing with a regular boot if failsafe not selected.
+               How long to wait for failsafe mode to be entered or for
+               a debug option to be pressed before continuing with a
+               regular boot.

 
 config TARGET_PREINIT_SHOW_NETMSG
        bool
 
 config TARGET_PREINIT_SHOW_NETMSG
        bool


@@ -45,7 +56,7 @@ config TARGET_PREINIT_SHOW_NETMSG
 
 config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
        bool
 
 config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
        bool

-       prompt "Suppress network message indicating failsafe" if PREINITOPT
+       prompt "Suppress network message indicating failsafe" if ( PREINITOPT && !TARGET_PREINIT_SHOW_NETMSG && !TARGET_PREINIT_DISABLE_FAILSAFE )

        default n
        help
                If "Show all preinit network messages" above is not set, then
        default n
        help
                If "Show all preinit network messages" above is not set, then


@@ -137,10 +148,10 @@ menuconfig VERSIONOPT
        default n
        help
                These options allow to override the version information embedded in
        default n
        help
                These options allow to override the version information embedded in

-               the /etc/openwrt_version, /etc/openwrt_release, /etc/banner and
-               /etc/opkg.conf files. Usually there is no need to set these, but
-               they're useful for release builds or custom OpenWrt redistributions
-               that should carry custom version tags.
+               the /etc/openwrt_version, /etc/openwrt_release, /etc/banner,
+               /etc/opkg.conf, and /etc/os-release files. Usually there is no need
+               to set these, but they're useful for release builds or custom OpenWrt
+               redistributions that should carry custom version tags.

 
 if VERSIONOPT
 
 
 if VERSIONOPT
 


@@ -164,27 +175,37 @@ if VERSIONOPT
                prompt "Release version number"
                help
                        This is the release version number embedded in the image.
                prompt "Release version number"
                help
                        This is the release version number embedded in the image.

-                       If unspecified, it defaults to the svn or git-svn revision
-                       of the build tree.
+                       If unspecified, it defaults to SNAPSHOT for the master branch
+                       or to ##.##-SNAPSHOT on release branches.
+
+       config VERSION_CODE
+               string
+               prompt "Release version code"
+               help
+                       This is the release version code embedded in the image.
+                       If unspecified, it defaults to a revision number describing the
+                       repository version of the source, e.g. the number of commits
+                       since a branch point or a short Git commit ID.

 
        config VERSION_REPO
                string
                prompt "Release repository"
 
        config VERSION_REPO
                string
                prompt "Release repository"

-               default "http://downloads.lede-project.org/snapshots/trunk/%S/packages"
+               default "http://downloads.lede-project.org/snapshots"

                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:
                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:

-                        %R .. Revision number
-                        %V .. Release version or revision number, uppercase
-                        %v .. Release version or revision number, lowercase
-                        %C .. Release version or "HEAD", uppercase
-                        %c .. Release version or "head", lowercase
+                        %R .. Repository revision ID
+                        %V .. Configured release version number or "SNAPSHOT", uppercase
+                        %v .. Configured release version number or "snapshot", lowercase
+                        %C .. Configured release revision code or value of %R, uppercase
+                        %c .. Configured release revision code or value of %R, lowercase

                         %N .. Release name, uppercase
                         %n .. Release name, lowercase
                         %D .. Distribution name or "Lede", uppercase
                         %d .. Distribution name or "lede", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name
                         %N .. Release name, uppercase
                         %n .. Release name, lowercase
                         %D .. Distribution name or "Lede", uppercase
                         %d .. Distribution name or "lede", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name

+                        %A .. Package architecture

                         %t .. Build taint flags, e.g. "no-all busybox"
                         %M .. Manufacturer name or "Lede"
                         %P .. Product name or "Generic"
                         %t .. Build taint flags, e.g. "no-all busybox"
                         %M .. Manufacturer name or "Lede"
                         %P .. Product name or "Generic"


@@ -204,6 +225,18 @@ if VERSIONOPT
                        This is an URL to the manufacturer's website embedded in /etc/device_info
                        Useful for OEMs building OpenWrt based firmware
 
                        This is an URL to the manufacturer's website embedded in /etc/device_info
                        Useful for OEMs building OpenWrt based firmware
 

+       config VERSION_BUG_URL
+               string
+               prompt "Bug reporting URL"
+               help
+                       This is an URL to provide users for providing bug reports
+
+       config VERSION_SUPPORT_URL
+               string
+               prompt "Support URL"
+               help
+                       This an URL to provide users seeking support
+

        config VERSION_PRODUCT
                string
                prompt "Product name"
        config VERSION_PRODUCT
                string
                prompt "Product name"


@@ -225,6 +258,15 @@ if VERSIONOPT
                help
                        Enable this to include the version number in firmware image, SDK-
                        and Image Builder archive file names
                help
                        Enable this to include the version number in firmware image, SDK-
                        and Image Builder archive file names

+
+       config VERSION_CODE_FILENAMES
+               bool
+               prompt "Revision code in filenames"
+               default y
+               help
+                       Enable this to include the revision identifier or the configured
+                       version code into the firmware image, SDK- and Image Builder archive
+                       file names

 endif
 
 
 endif