From 32740ed90c4e7c19c83380bc4825c24deb0a6079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Sat, 14 Dec 2019 21:16:54 +0100
Subject: [PATCH] buildscript: Put binaries in seperate folders per variant.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To make it easier to find the correct binary, this creates
a seperate folder for every variant and copies the binaries
appropriately.

The folder is created with "-p" to suppress errors, if it already
exists. This means the misplaced creation of the "bin"-folder inside
the build function can be ommited.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
---
 buildscript | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/buildscript b/buildscript
index 5f0aa76..8e73944 100755
--- a/buildscript
+++ b/buildscript
@@ -246,10 +246,6 @@ build() {
 
     cd "$opath"
 
-    if [ ! -d bin ]; then
-        mkdir bin
-    fi
-
     cp_firmware
 }
 
@@ -294,17 +290,19 @@ rm_firmware() {
 cp_firmware() {
     [ -n "$subtarget" ] || subtarget="generic"
 
+    mkdir -p "bin/$variant"
+
     for image in ${images[@]}; do
         filename_build=${image//openwrt/fff-${version}}
         filename_build=${filename_build//squashfs-/}
         filename_build=${filename_build//${chipset}-${subtarget}-/}
-        cp "$builddir/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
+        cp "$builddir/bin/targets/${chipset}/${subtarget}/$image" "./bin/$variant/$filename_build"
 
         for region in "" "-eu" "-us"; do
             image_factory=${image/sysupgrade/factory$region}
             if [[ -f "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then
               filename_build_factory=${filename_build/sysupgrade/factory$region}
-              cp "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" "./bin/$filename_build_factory"
+              cp "$builddir/bin/targets/${chipset}/${subtarget}/$image_factory" "./bin/$variant/$filename_build_factory"
             fi
         done
     done
@@ -329,13 +327,13 @@ buildrelease() {
         build $fast
     fi
 
-    cd bin
+    cd bin/$variant
     for binary in *.bin; do
         md5sum "$binary" > ./"$binary".md5
         sha256sum "$binary" > ./"$binary".sha256
     done
-    cd ..
-    echo -e "VERSION:$version" > ./bin/release.nfo
+    echo -e "VERSION:$version" > release.nfo
+    cd ../..
 }
 
 clean() {