diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-31 13:11:49 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-01 10:05:42 +0100 |
| commit | 214c3dc91ceb1557b62ad3a359c72cfc9b2bf4f0 (patch) | |
| tree | f5c5feb41377cc8b24c555c08532ee7e4bcbdc74 /meta/classes-global | |
| parent | 217b00d378f359689613ca4c0666bb2eed040f69 (diff) | |
| download | openembedded-core-214c3dc91ceb1557b62ad3a359c72cfc9b2bf4f0.tar.gz | |
meta/conf: move default configuration templates into meta/conf/templates/default
This sets the ground for standardizing (and enforcing) the location of
configuration templates: let's start with the default one.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-global')
| -rw-r--r-- | meta/classes-global/sanity.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index 4a403a2590..75c453d486 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass @@ -42,7 +42,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \ SANITY_DIFF_TOOL ?= "meld" -SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/local.conf.sample" +SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" python oecore_update_localconf() { # Check we are using a valid local.conf current_conf = d.getVar('CONF_VERSION') @@ -62,7 +62,7 @@ is a good way to visualise the changes.""" raise NotImplementedError(failmsg) } -SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample" +SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/site.conf.sample" python oecore_update_siteconf() { # If we have a site.conf, check it's valid current_sconf = d.getVar('SCONF_VERSION') @@ -82,7 +82,7 @@ is a good way to visualise the changes.""" raise NotImplementedError(failmsg) } -SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/bblayers.conf.sample" +SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/bblayers.conf.sample" python oecore_update_bblayers() { # bblayers.conf is out of date, so see if we can resolve that |