diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-11-18 19:30:50 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-11-18 20:08:31 +0300 |
commit | f4e5dde7fa70d6927253adf5cf32c31073293b32 (patch) | |
tree | 197ca8e7bfa105f9b50c1337620c824c9eb60b7e | |
parent | f241bb5774c192f7e64e38b87e0a455f90c5ce54 (diff) | |
download | openbmc-2.13.0.tar.xz |
setup: fix multi-machine layers2.13.0
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)
-rwxr-xr-x | setup | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |