From b851e590b9abf8b08c1c164ca1c450034b1113f5 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 7 Feb 2022 20:04:20 +0100 Subject: [PATCH] Fix version in build --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 7b94d28e..3fb91bb1 100755 --- a/build.sh +++ b/build.sh @@ -193,7 +193,7 @@ if [ -f $OMR_TARGET_CONFIG ]; then CONFIG_VERSIONOPT=y CONFIG_VERSION_DIST="$OMR_DIST" CONFIG_VERSION_REPO="$OMR_REPO" - CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)" + CONFIG_VERSION_NUMBER="${OMR_RELEASE}-${OMR_KERNEL}" EOF else cat config -> "$OMR_TARGET/source/.config" <<-EOF @@ -201,7 +201,7 @@ else CONFIG_VERSIONOPT=y CONFIG_VERSION_DIST="$OMR_DIST" CONFIG_VERSION_REPO="$OMR_REPO" - CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)-$(git -C "$OMR_FEED" rev-parse --short HEAD)" + CONFIG_VERSION_NUMBER="${OMR_RELEASE}-${OMR_FEED_SRC}-$(git -C "$OMR_FEED" rev-parse --short HEAD)" EOF fi #if [ "$OMR_KERNEL" = "5.14" ]; then