fix machine definition substitution

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index da5ac3ed07280cdd464f5e87261da1027a5a75dd..d705400d5fe3c4b001d347070c08a3fb7241881a 100644 (file)
--- 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"
 
 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"
 #MACHINE ?= 'tx6q-1030'
 DISTRO ?= 'poky'
 DISTRO_FEATURES_remove = "wayland systemd x11"

diff --git a/setup-environment b/setup-environment
index 1b95c5ad33f6b01e88fb54136eba34a5f42036f0..672929c99aadd011f0dc0539507816ebdcc57ffc 100755 (executable)
--- 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
 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
 
         -e "s,DISTRO ?=.*,DISTRO ?= '$DISTRO',g" \
         -i conf/local.conf