build: fix the version in 'show version' for RPM 52/30752/2
authorAndrew Yourtchenko <ayourtch@gmail.com>
Wed, 30 Sep 2020 23:53:35 +0000 (23:53 +0000)
committerDave Wallace <dwallacelf@gmail.com>
Thu, 21 Jan 2021 17:01:57 +0000 (17:01 +0000)
The RPM build ends up with "vXX.YY" to vstring,
which is not what we'd expect - so fix it up.

Change-Id: I0af68e69b1e40fc49ade759bb2f0ed9f47614217
Type: fix
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
(cherry picked from commit 072def4738f149a6e3f2f3884fae55690d6ad3a1)

src/scripts/version

index 455ab76..1c265bf 100755 (executable)
@@ -30,6 +30,11 @@ TAG=$(echo ${vstring} | cut -d- -f1 | sed -e 's/^v//')
 ADD=$(echo ${vstring} | cut -s -d- -f2)
 POINT=$(echo ${TAG} | cut -d. -f3)
 
+# during make pkg-rpm vstring ends up being vXX.YY, which is not what we expect. Fix it up.
+if [ -z "${ADD}" ]; then
+  ADD="0"
+fi
+
 # if this is a "implicit zeroth" release (e.g. 19.08), check if we need to add ".0"
 # to fix the artifact versioning sorting
 if [ -z "${POINT}" ]; then