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
diff --git a/setup b/setup
index 08ac4f4..5152c59 100755
--- a/setup
+++ b/setup
@@ -62,10 +62,10 @@
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 @@
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