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>

diff --git a/.templateconf b/.templateconf
index 0bf5ecf1e5da02af0055ceb35eae4115fa7d7f8e..e399e06acdf10082365356e14143465d1633753b 100644 (file)
--- 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 4a403a2590ec11823ca40eed38deacf5945813e1..75c453d48674adb83eb54712dc399d4d63962c46 100644 (file)
--- 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
similarity index 100%
rename from meta/conf/bblayers.conf.sample
rename to meta/conf/templates/default/bblayers.conf.sample

diff --git a/meta/conf/conf-notes.txt b/meta/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta/conf/conf-notes.txt
rename to meta/conf/templates/default/conf-notes.txt

diff --git a/meta/conf/local.conf.sample b/meta/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta/conf/local.conf.sample
rename to 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
similarity index 100%
rename from meta/conf/local.conf.sample.extended
rename to meta/conf/templates/default/local.conf.sample.extended

diff --git a/meta/conf/site.conf.sample b/meta/conf/templates/default/site.conf.sample
similarity index 100%
rename from meta/conf/site.conf.sample
rename to meta/conf/templates/default/site.conf.sample

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 5d644168cb9558cef770bd99872d0f06ef9f4510..975619789a1788836bf4b4b917f7e7f395737761 100755 (executable)
--- 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