diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-31 13:11:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-16 17:11:11 +0000 |
commit | d369a45ae7c6b82f7ae337a56a673eed5afc461b (patch) | |
tree | 0c055c9a747592b76e9d60f66387937f0676a71b /meta/classes-global/sanity.bbclass | |
parent | 44311c454d0b0856f58cfa6fa60669903b2ba3af (diff) | |
download | poky-d369a45ae7c6b82f7ae337a56a673eed5afc461b.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/sanity.bbclass')
-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 c90fc84b76..2d1ff7072c 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass | |||
@@ -42,7 +42,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \ | |||
42 | 42 | ||
43 | SANITY_DIFF_TOOL ?= "meld" | 43 | SANITY_DIFF_TOOL ?= "meld" |
44 | 44 | ||
45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/local.conf.sample" | 45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" |
46 | python oecore_update_localconf() { | 46 | python oecore_update_localconf() { |
47 | # Check we are using a valid local.conf | 47 | # Check we are using a valid local.conf |
48 | current_conf = d.getVar('CONF_VERSION') | 48 | current_conf = d.getVar('CONF_VERSION') |
@@ -62,7 +62,7 @@ is a good way to visualise the changes.""" | |||
62 | raise NotImplementedError(failmsg) | 62 | raise NotImplementedError(failmsg) |
63 | } | 63 | } |
64 | 64 | ||
65 | SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/site.conf.sample" | 65 | SANITY_SITECONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/site.conf.sample" |
66 | python oecore_update_siteconf() { | 66 | python oecore_update_siteconf() { |
67 | # If we have a site.conf, check it's valid | 67 | # If we have a site.conf, check it's valid |
68 | current_sconf = d.getVar('SCONF_VERSION') | 68 | current_sconf = d.getVar('SCONF_VERSION') |
@@ -82,7 +82,7 @@ is a good way to visualise the changes.""" | |||
82 | raise NotImplementedError(failmsg) | 82 | raise NotImplementedError(failmsg) |
83 | } | 83 | } |
84 | 84 | ||
85 | SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/bblayers.conf.sample" | 85 | SANITY_BBLAYERCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/bblayers.conf.sample" |
86 | python oecore_update_bblayers() { | 86 | python oecore_update_bblayers() { |
87 | # bblayers.conf is out of date, so see if we can resolve that | 87 | # bblayers.conf is out of date, so see if we can resolve that |
88 | 88 | ||