From f4e5dde7fa70d6927253adf5cf32c31073293b32 Mon Sep 17 00:00:00 2001
From: Patrick Williams <patrick@stwcx.xyz>
Date: Fri, 18 Nov 2022 10:30:50 -0600
Subject: setup: fix multi-machine layers

When making the change required by Yocto to move configs into
template subdirectories, the setup script wasn't updated in a
way to handle the appropriate fix-up of the MACHINE variable
in the `conf/local.conf`.

Fixes bb789d5694b3696a9aa81d2cd37a1c7f39908ed8

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If90f1a3c4052c019ea88eeea7787bc2b252f6094
(cherry picked from commit 08b6cec504bcededcc23a7293d064c118c37b371)
---
 setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup b/setup
index 5152c59850..9398cb9547 100755
--- a/setup
+++ b/setup
@@ -79,7 +79,7 @@ machine() {
                 TEMPLATECONF="${tmpl}/templates/default" source \
                         oe-init-build-env "${build_dir}"
 
-                if [ "$(cat conf/templateconf.cfg)" = "${tmpl}" ]; then
+                if [ "$(cat conf/templateconf.cfg)" = "${tmpl}/templates/default" ]; then
                     sed "s/^\(MACHINE\s*[?:]*\s*=\s*\).*$/\1\"${target}\"/" \
                         -i conf/local.conf
                 fi
-- 
cgit v1.2.3