diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/files/etc/banner | 2 | ||||
| -rw-r--r-- | package/base-files/files/etc/openwrt_release | 4 | ||||
| -rw-r--r-- | package/base-files/files/etc/openwrt_version | 2 | ||||
| -rw-r--r-- | package/base-files/files/usr/lib/os-release | 2 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 23 |
5 files changed, 21 insertions, 12 deletions
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner index 66dc14be06..4ec646a933 100644 --- a/package/base-files/files/etc/banner +++ b/package/base-files/files/etc/banner @@ -5,6 +5,6 @@ /________/ LE \ |____|___|___/|___| lede-project.org \ \ DE / \ LE \ / ----------------------------------------------------------- - \ DE \ / %N (%C, %R) + \ DE \ / %N (%V, %C) \________\/ ----------------------------------------------------------- diff --git a/package/base-files/files/etc/openwrt_release b/package/base-files/files/etc/openwrt_release index 9b2a40c820..46ad63209f 100644 --- a/package/base-files/files/etc/openwrt_release +++ b/package/base-files/files/etc/openwrt_release @@ -1,7 +1,7 @@ DISTRIB_ID='%D' -DISTRIB_RELEASE='%C' +DISTRIB_RELEASE='%V' DISTRIB_REVISION='%R' DISTRIB_CODENAME='%n' DISTRIB_TARGET='%S' -DISTRIB_DESCRIPTION='%D %N %V' +DISTRIB_DESCRIPTION='%D %N %V %C' DISTRIB_TAINTS='%t' diff --git a/package/base-files/files/etc/openwrt_version b/package/base-files/files/etc/openwrt_version index 4b14f596fb..48157ed97f 100644 --- a/package/base-files/files/etc/openwrt_version +++ b/package/base-files/files/etc/openwrt_version @@ -1 +1 @@ -%V +%C diff --git a/package/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release index 6c829e0670..79b08d16cf 100644 --- a/package/base-files/files/usr/lib/os-release +++ b/package/base-files/files/usr/lib/os-release @@ -14,4 +14,4 @@ LEDE_DEVICE_MANUFACTURER="%M" LEDE_DEVICE_MANUFACTURER_URL="%m" LEDE_DEVICE_PRODUCT="%P" LEDE_DEVICE_REVISION="%h" -LEDE_RELEASE="%C" +LEDE_RELEASE="%D %N %V %C" diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 43d3859301..4610c2b995 100644 --- 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. - 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 @@ -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: - %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 |