From patchwork Tue Nov 19 20:19:37 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [1/4] buildscript: Add variant variable, store variant in release-file
From: Fabian Blaese <fabian@blaese.de>
X-Patchwork-Id: 1219
Message-Id: <20191119201940.70424-1-fabian@blaese.de>
To: franken-dev@freifunk.net
Date: Tue, 19 Nov 2019 21:19:37 +0100

The variant is read multiple times from selected_variant file.
Therefore a variant variable is introduced.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Christian Dresel <fff@chrisi01.de>
---
 buildscript | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildscript b/buildscript
index 00f1874..0920b74 100755
--- a/buildscript
+++ b/buildscript
@@ -200,16 +200,18 @@ prebuild() {
     done < <(find "${builddir}/files" -name '*.tpl' -print0)
 
     #insert actual firware version informations into release file
+    variant=$(cat selected_variant)
     version=$(git describe --tags --dirty)
     if [ 0 -ne $? ]; then
         version=$(git log -1 --pretty=format:%h)
     fi
-    if [ -n "$(cat selected_variant)" ]; then
-        version="$(cat selected_variant)-$version"
+    if [ -n "$variant" ]; then
+        version="$variant-$version"
     fi
 
     {
         echo "FIRMWARE_VERSION=\"$version\""
+        echo "VARIANT=\"$variant\""
         echo "BUILD_DATE=\"build date: $(date)\""
         echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\""
         echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\""