| Message ID | 20220824124234.3549247-1-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | 214c3dc91ceb1557b62ad3a359c72cfc9b2bf4f0 |
| Headers | show |
| Series | [1/2] meta/conf: move default configuration templates into meta/conf/templates/default | expand |
Hello Alex, On Wed, 24 Aug 2022 14:42:33 +0200 "Alexander Kanavin" <alex.kanavin@gmail.com> wrote: > 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> I have been trying to apply this patch, and it applies on oe-core, but then combo-layer fails in picking it because poky has a different .templateconf file. I'm not sure how this should be fixed, maybe the patch should be done against meta-yocto (which has a .templateconf identical to the one in poky)?
I've sent a separate patch for meta-yocto to poky@ list, does that help? Alex On Thu, 25 Aug 2022 at 15:37, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > Hello Alex, > > On Wed, 24 Aug 2022 14:42:33 +0200 > "Alexander Kanavin" <alex.kanavin@gmail.com> wrote: > > > 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> > > I have been trying to apply this patch, and it applies on oe-core, but > then combo-layer fails in picking it because poky has a different > .templateconf file. I'm not sure how this should be fixed, maybe the > patch should be done against meta-yocto (which has a .templateconf > identical to the one in poky)? > > -- > Luca Ceresoli, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
Hi Alex,
On Thu, 25 Aug 2022 15:45:21 +0200
"Alexander Kanavin" <alex.kanavin@gmail.com> wrote:
> I've sent a separate patch for meta-yocto to poky@ list, does that help?
Oops, I can't find any such patch in the poky@ list.
Luca
On Fri, 26 Aug 2022 at 11:04, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > I've sent a separate patch for meta-yocto to poky@ list, does that help? > > Oops, I can't find any such patch in the poky@ list. This: https://lists.yoctoproject.org/g/poky/message/12870 Alex
Hi Alex, On Fri, 26 Aug 2022 11:08:15 +0200 "Alexander Kanavin" <alex.kanavin@gmail.com> wrote: > On Fri, 26 Aug 2022 at 11:04, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > > I've sent a separate patch for meta-yocto to poky@ list, does that help? > > > > Oops, I can't find any such patch in the poky@ list. > > This: > https://lists.yoctoproject.org/g/poky/message/12870 Oh, no! I'm not receiving any poky@ emails anymore! The last I got is from August 23. On the website my subscription seems OK, and there is nothing in my spam folder. And, last but not least, the website does not seem to allow downloading an email as an mbox file. :-( I wrote to the help address.
On Fri, 26 Aug 2022 at 12:27, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > Oh, no! I'm not receiving any poky@ emails anymore! The last I got is > from August 23. On the website my subscription seems OK, and there is > nothing in my spam folder. And, last but not least, the website does > not seem to allow downloading an email as an mbox file. :-( > > I wrote to the help address. I sent the patch to you directly. Perhaps you can first try to unsubscribe/resubscribe and send a test email to poky@ ? Alex
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 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 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
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> --- .templateconf | 2 +- meta/classes-global/sanity.bbclass | 6 +++--- meta/conf/{ => templates/default}/bblayers.conf.sample | 0 meta/conf/{ => templates/default}/conf-notes.txt | 0 meta/conf/{ => templates/default}/local.conf.sample | 0 .../conf/{ => templates/default}/local.conf.sample.extended | 0 meta/conf/{ => templates/default}/site.conf.sample | 0 scripts/oe-setup-builddir | 6 +++--- 8 files changed, 7 insertions(+), 7 deletions(-) rename meta/conf/{ => templates/default}/bblayers.conf.sample (100%) rename meta/conf/{ => templates/default}/conf-notes.txt (100%) rename meta/conf/{ => templates/default}/local.conf.sample (100%) rename meta/conf/{ => templates/default}/local.conf.sample.extended (100%) rename meta/conf/{ => templates/default}/site.conf.sample (100%)