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 /meta-ibm/conf/templates | |
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 'meta-ibm/conf/templates')
-rw-r--r-- | meta-ibm/conf/templates/default/bblayers.conf.sample | 19 | ||||
-rw-r--r-- | meta-ibm/conf/templates/default/local.conf.sample | 20 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-ibm/conf/templates/default/bblayers.conf.sample b/meta-ibm/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..9ce105376d --- /dev/null +++ b/meta-ibm/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,19 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + " diff --git a/meta-ibm/conf/templates/default/local.conf.sample b/meta-ibm/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..f73f5d5af9 --- /dev/null +++ b/meta-ibm/conf/templates/default/local.conf.sample @@ -0,0 +1,20 @@ +#MACHINE ?= "mihawk" +#MACHINE ?= "p10bmc" +#MACHINE ?= "swift" +MACHINE ??= "witherspoon" +DISTRO ?= "openbmc-openpower" +PACKAGE_CLASSES ?= "package_ipk" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" +CONF_VERSION = "2" |