From 76cda32940fdb4e629898e5344a975528b910f46 Mon Sep 17 00:00:00 2001 From: Sam Dolt Date: Mon, 13 Nov 2023 15:35:36 +0100 Subject: [PATCH] fix(templates): move templates directory under meta-belden-coreos OpenEmbedded now include a checks that the template directory is inside a subdirectory of the conf/templates directory of a layer. This prevent the build from failing with "Error: TEMPLATECONF value (which is coreos/templates) must point to meta-some-layer/conf/templates/template-name" when sourcing coreos-init-buildenv with OE-Core Master. --- coreos-init-build-env | 2 +- .../conf/templates/default}/bblayers.conf.sample | 0 .../meta-belden-coreos/conf/templates/default}/conf-notes.txt | 0 .../conf/templates/default}/local.conf.sample | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename {templates => layers/meta-belden-coreos/conf/templates/default}/bblayers.conf.sample (100%) rename {templates => layers/meta-belden-coreos/conf/templates/default}/conf-notes.txt (100%) rename {templates => layers/meta-belden-coreos/conf/templates/default}/local.conf.sample (100%) diff --git a/coreos-init-build-env b/coreos-init-build-env index 6841e38..a385606 100755 --- a/coreos-init-build-env +++ b/coreos-init-build-env @@ -27,7 +27,7 @@ COREOS_ROOT=$(readlink -f "${COREOS_ROOT}") # All theses values can be overriden by the caller of coreos-init-build-env BITBAKEDIR="${BITBAKEDIR:-${COREOS_ROOT}/bitbake}" OEROOT="${OEROOT:-${COREOS_ROOT}/external-layers/openembedded-core}" -TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/templates}" +TEMPLATECONF="${TEMPLATECONF:-${COREOS_ROOT}/layers/meta-belden-coreos/conf/templates/default}" # Sanity checks # ------------------------------------------------------------------------------ diff --git a/templates/bblayers.conf.sample b/layers/meta-belden-coreos/conf/templates/default/bblayers.conf.sample similarity index 100% rename from templates/bblayers.conf.sample rename to layers/meta-belden-coreos/conf/templates/default/bblayers.conf.sample diff --git a/templates/conf-notes.txt b/layers/meta-belden-coreos/conf/templates/default/conf-notes.txt similarity index 100% rename from templates/conf-notes.txt rename to layers/meta-belden-coreos/conf/templates/default/conf-notes.txt diff --git a/templates/local.conf.sample b/layers/meta-belden-coreos/conf/templates/default/local.conf.sample similarity index 100% rename from templates/local.conf.sample rename to layers/meta-belden-coreos/conf/templates/default/local.conf.sample