From 441e3a8e3c4cb87660f26e2aea295a22373b14fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Sun, 10 Nov 2019 16:33:56 +0100
Subject: [PATCH] buildscript: Apply variant to builddir in build step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The build variant previously only got applied in the prepare
step. Therefore selecting a new variant for a subsequent build
without calling prepare again produced a build with a different
variant than the selected one.

As the filename and version number is evaluated in the prebuild
step, which is called on every build, the version number did use
selected variant, so the build variant did not match the variant
in the version string.

As applying the variant only causes the fff-base package to be
fully rebuilt, this step is moved into a function and also executed
in buildscripts prebuild step. It is therefore always applied when
starting a new build.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 buildscript | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/buildscript b/buildscript
index 098a70db..306b91fd 100755
--- a/buildscript
+++ b/buildscript
@@ -131,10 +131,9 @@ prepare() {
 
     patch_target
 
-    # set the variant for this build
-    cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk
-    # force the reevaluation of this Makefile to make note of the new variant
-    touch ./src/packages/fff/fff/Makefile
+    # apply variant to ensure the included file "variant.mk"
+    # exists in builddir.
+    apply_variant
 
     #saves ~200MB for each build
     test -d ./src/dl || mkdir ./src/dl
@@ -143,6 +142,13 @@ prepare() {
     update_feeds
 }
 
+apply_variant() {
+    # set the variant for this build
+    cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk
+    # force the reevaluation of this Makefile to make note of the new variant
+    touch ./src/packages/fff/fff/Makefile
+}
+
 update_feeds() {
     ## generate own feeds.conf
     #this local variable should be globally configure variable used in get_source and here
@@ -177,6 +183,8 @@ update_feeds() {
 }
 
 prebuild() {
+    apply_variant
+
     #create filesdir for our config
     /bin/rm -rf "$builddir"/files
     mkdir "$builddir"/files