From b40484e262342a90bef3e2e56200e1a0d50cdb81 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 10 Oct 2023 15:33:25 +0200
Subject: [PATCH] board/common: fix load_cfg key=value extraction

Calling `load_cfg BR2_EXTERNAL_INFIX_PATH` from post-image.sh caused
warnings due to multiple hits in the .config file:

post-image.sh: 12: /tmp/tmp.5a3xhQQVc8: BR2_EXTERNAL_INFIX_PATH: not found
post-image.sh: 13: /tmp/tmp.5a3xhQQVc8: BR2_EXTERNAL_INFIX_PATH: not found

Let's grep for a "key.*=" instead of "key" to drop those warnings, while
still acting as a catch-all for partial matches.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 board/common/lib.sh        | 17 +++++++++++++----
 board/common/post-image.sh |  4 +---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/board/common/lib.sh b/board/common/lib.sh
index 1c8d7dee..affa806e 100644
--- a/board/common/lib.sh
+++ b/board/common/lib.sh
@@ -9,11 +9,20 @@ die()
     exit 1
 }
 
+# Find all matching key=value assignments in output/.config
+# E.g., load_cfg DISK_IMAGE sets the following variables:
+#
+#      DISK_IMAGE=y
+#      DISK_IMAGE_SIZE="512"
+#      etc.
+#
+# shellcheck disable=SC1090
 load_cfg()
 {
-    local tmp=$(mktemp -p /tmp)
+    tmp=$(mktemp -p /tmp)
 
-    grep "$1" $BR2_CONFIG >$tmp
-    .  $tmp
-    rm $tmp
+    grep -E "${1}.*=" "$BR2_CONFIG" >"$tmp"
+    .  "$tmp"
+
+    rm "$tmp"
 }
diff --git a/board/common/post-image.sh b/board/common/post-image.sh
index 57185e2f..9fddbf5c 100755
--- a/board/common/post-image.sh
+++ b/board/common/post-image.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 common=$(dirname "$(readlink -f "$0")")
-. $common/lib.sh
+. "$common/lib.sh"
 
 load_cfg BR2_ARCH
 load_cfg BR2_DEFCONFIG
@@ -50,8 +50,6 @@ fi
 
 load_cfg GNS3_APPLIANCE
 if [ "$GNS3_APPLIANCE" = "y" ]; then
-    load_cfg GNS3_APPLIANCE_RAM
-    load_cfg GNS3_APPLIANCE_IFNUM
     ixmsg "Creating GNS3 Appliance, $GNS3_APPLIANCE_RAM MiB with $GNS3_APPLIANCE_IFNUM ports"
     $common/mkgns3a.sh $NAME $GNS3_APPLIANCE_RAM $GNS3_APPLIANCE_IFNUM
 fi