commit 8565d2a0302f99f1fa57750f08da5e6435e249fd
author Andrew Geissler <geissonator@yahoo.com> Mon Apr 20 15:22:14 2020 -0500
committer Andrew Geissler <geissonator@yahoo.com> Wed Apr 22 18:56:41 2020 +0000
tree 73c9d8fbecc428a7ee6abfe521ad65b9c5bf4d1f
parent 089852c8227a80f12d06a6a9e08c59e917d65153

build-setup.sh: do not require DISTRO

In general, using the default DISTRO defined in the layer is what should
be tested in CI. gsj in fact requires this in order to fit with python3
now the default.

Change-Id: Ice618e1ccda7dbcaf1c8d07eb0f68ba3848718cf
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

build-setup.sh

diff --git a/build-setup.sh b/build-setup.sh
index 08f4cae..3145ac1 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -190,7 +190,7 @@
   gsj)
     LAYER_DIR="meta-quanta/meta-gsj"
     MACHINE="gsj"
-    DISTRO="openbmc-phosphor"
+    # Use default DISTRO from layer
     ;;
   *)
     exit 1
@@ -354,13 +354,18 @@
 # Source our build env
 ${BITBAKE_CMD}
 
-if [[ -z "${MACHINE}" || -z "${DISTRO}" ]]; then
-  echo "MACHINE or DISTRO is not configured for ${target}"
+if [[ -z "${MACHINE}" ]]; then
+  echo "MACHINE is not configured for ${target}"
   exit 1
 fi
 
 export MACHINE="${MACHINE}"
-export DISTRO="${DISTRO}"
+if [[ -z "${DISTRO}" ]]; then
+  echo "DISTRO is not configured for ${target} so will use default"
+  unset DISTRO
+else
+  export DISTRO="${DISTRO}"
+fi
 
 # Custom BitBake config settings
 cat >> conf/local.conf << EOF_CONF