From: Florian Boor <florian@kernelconcepts.de>
Date: Wed, 20 Jun 2018 14:09:12 +0000 (+0200)
Subject: fix machine definition substitution
X-Git-Url: https://git.karo-electronics.de/?p=meta-kc-bsp.git;a=commitdiff_plain;h=539e1bdf634a51d13ebb01190774479b2afad095

fix machine definition substitution
---

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index da5ac3e..d705400 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,7 +1,7 @@
 PREFERRED_VERSION_linux-karo = "4.9.11"
 PREFERRED_VERSION_imx-gpu-viv = "6.2.2.p0-aarch32"
 
-MACHINE = 'tx6u-8033'
+MACHINE ?= 'tx6u-8033'
 #MACHINE ?= 'tx6q-1030'
 DISTRO ?= 'poky'
 DISTRO_FEATURES_remove = "wayland systemd x11"
diff --git a/setup-environment b/setup-environment
index 1b95c5a..672929c 100755
--- a/setup-environment
+++ b/setup-environment
@@ -163,7 +163,7 @@ if [ "$build_dir_setup_enabled" = "true" ]; then
 DL_DIR ?= "\${BSPDIR}/downloads/"
 EOF
     # Change settings according environment
-    sed -e "s,MACHINE ??=.*,MACHINE ??= '$MACHINE',g" \
+    sed -e "s,MACHINE ?=.*,MACHINE ?= '$MACHINE',g" \
         -e "s,DISTRO ?=.*,DISTRO ?= '$DISTRO',g" \
         -i conf/local.conf