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 bb789d5 Signed-off-by: Patrick Williams <[email protected]> Change-Id: If90f1a3c4052c019ea88eeea7787bc2b252f6094
ibm-openbmc · Nov 18, 2022 · 08b6cec · 08b6cec
1 parent 9c01098
commit 08b6cec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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