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 | |
parent | 217b00d378f359689613ca4c0666bb2eed040f69 (diff) | |
download | openembedded-core-contrib-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>
-rw-r--r-- | .templateconf | 2 | ||||
-rw-r--r-- | meta/classes-global/sanity.bbclass | 6 | ||||
-rw-r--r-- | meta/conf/templates/default/bblayers.conf.sample (renamed from meta/conf/bblayers.conf.sample) | 0 | ||||
-rw-r--r-- | meta/conf/templates/default/conf-notes.txt (renamed from meta/conf/conf-notes.txt) | 0 | ||||
-rw-r--r-- | meta/conf/templates/default/local.conf.sample (renamed from meta/conf/local.conf.sample) | 0 | ||||
-rw-r--r-- | meta/conf/templates/default/local.conf.sample.extended (renamed from meta/conf/local.conf.sample.extended) | 0 | ||||
-rw-r--r-- | meta/conf/templates/default/site.conf.sample (renamed from meta/conf/site.conf.sample) | 0 | ||||
-rwxr-xr-x | scripts/oe-setup-builddir | 6 |
8 files changed, 7 insertions, 7 deletions
diff --git a/.templateconf b/.templateconf index 0bf5ecf1e5..e399e06acd 100644 --- a/.templateconf +++ b/.templateconf @@ -1,2 +1,2 @@ # Template settings -TEMPLATECONF=${TEMPLATECONF:-meta/conf} +TEMPLATECONF=${TEMPLATECONF:-meta/conf/templates/default} 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 diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/templates/default/bblayers.conf.sample index c985f4f242..c985f4f242 100644 --- a/meta/conf/bblayers.conf.sample +++ b/meta/conf/templates/default/bblayers.conf.sample diff --git a/meta/conf/conf-notes.txt b/meta/conf/templates/default/conf-notes.txt index cfd1f1977b..cfd1f1977b 100644 --- a/meta/conf/conf-notes.txt +++ b/meta/conf/templates/default/conf-notes.txt diff --git a/meta/conf/local.conf.sample b/meta/conf/templates/default/local.conf.sample index f6be0a59d1..f6be0a59d1 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/templates/default/local.conf.sample diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/templates/default/local.conf.sample.extended index a898b18d59..a898b18d59 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/templates/default/local.conf.sample.extended diff --git a/meta/conf/site.conf.sample b/meta/conf/templates/default/site.conf.sample index 5164fedf63..5164fedf63 100644 --- a/meta/conf/site.conf.sample +++ b/meta/conf/templates/default/site.conf.sample diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5d644168cb..975619789a 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -69,7 +69,7 @@ fi unset SHOWYPDOC if [ -z "$OECORELOCALCONF" ]; then - OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" + OECORELOCALCONF="$OEROOT/meta/conf/templates/default/local.conf.sample" fi if [ ! -r "$BUILDDIR/conf/local.conf" ]; then cat <<EOM @@ -85,7 +85,7 @@ EOM fi if [ -z "$OECORELAYERCONF" ]; then - OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" + OECORELAYERCONF="$OEROOT/meta/conf/templates/default/bblayers.conf.sample" fi if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then cat <<EOM @@ -125,7 +125,7 @@ EOM fi if [ -z "$OECORENOTESCONF" ]; then - OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" + OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" fi [ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" unset OECORENOTESCONF |