diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-09-09 17:47:35 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-09-09 17:53:41 +0300 |
commit | bb789d5694b3696a9aa81d2cd37a1c7f39908ed8 (patch) | |
tree | b9a9fa6ad0637a2317e438db2291aa7ea4c86600 /setup | |
parent | 5f8ad30b34eed6ef2984603f8cc17f4bd8d94c75 (diff) | |
download | openbmc-bb789d5694b3696a9aa81d2cd37a1c7f39908ed8.tar.xz |
treewide: handle upstream TEMPLATECONF move
The latest poky commit is requiring us to have all of
our template configs in a subdirectory instead of directly in
the `conf` directory. Without this we end up with errors during
setup like:
```
Error: TEMPLATECONF value (which is .../openbmc/meta-facebook/meta-bletchley/conf) must point to meta-some-layer/conf/templates/template-name
```
Fix this by moving all of our template files into the 'default'
template subdirectory (following the pattern of poky) and modifying
`setup` as necessary to follow.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iecefde73d55acbb6bc63ae3d68c4311adaf327ae
Diffstat (limited to 'setup')
-rwxr-xr-x | setup | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -62,10 +62,10 @@ machine() { tmpl="meta-phosphor/conf" else # Skip any machines that don't support meta-phosphor. - if [ ! -e "$tmpl/bblayers.conf.sample" ]; then + if [ ! -e "$tmpl/templates/default/bblayers.conf.sample" ]; then continue fi - if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/bblayers.conf.sample"; then + if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/templates/default/bblayers.conf.sample"; then continue fi fi @@ -76,7 +76,7 @@ machine() { if [ "${name}" = "${target}" ]; then echo "Machine ${target} found in ${tmpl%/conf}" mkdir -p "${build_dir}" - TEMPLATECONF="${tmpl}" source \ + TEMPLATECONF="${tmpl}/templates/default" source \ oe-init-build-env "${build_dir}" if [ "$(cat conf/templateconf.cfg)" = "${tmpl}" ]; then |