From 072def4738f149a6e3f2f3884fae55690d6ad3a1 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Wed, 30 Sep 2020 23:53:35 +0000 Subject: build: fix the version in 'show version' for RPM 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 --- src/scripts/version | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/scripts/version b/src/scripts/version index 455ab760352..1c265bff68f 100755 --- a/src/scripts/version +++ b/src/scripts/version @@ -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 -- cgit 1.2.3-korg