build: adjust version number handling

[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 43d3859301487391394a6838e88701e5b37916e9..4610c2b995a32ba4abe8353a1e88aaf06ad75b39 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -175,8 +175,17 @@ 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 CURRENT for the master branch
+                       or to ##.##-CURRENT 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
 
        config VERSION_REPO
                string


@@ -185,11 +194,11 @@ if VERSIONOPT
                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 "CURRENT", uppercase
+                        %v .. Configured release version number or "current", 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
                         %N .. Release name, uppercase
                         %n .. Release name, lowercase
                         %D .. Distribution name or "Lede", uppercase