[PATCH 1/2] meta/conf/templates/default/conf-notes.txt: remove

[PATCH 1/2] meta/conf/templates/default/conf-notes.txt: remove

[Alexander Kanavin]

This is present in the poky repository, even though it should
not be:
https://git.yoctoproject.org/poky/tree/meta/conf/templates/default

I couldn't find which tool leaves the file in place when combining
oe-core/bitbake/meta-yocto repos into poky, so this patch is rather
a request to point me to where it happens (or just fix it directly there).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/conf/templates/default/conf-notes.txt | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 meta/conf/templates/default/conf-notes.txt

diff --git a/meta/conf/templates/default/conf-notes.txt b/meta/conf/templates/default/conf-notes.txt
deleted file mode 100644
index cfd1f1977bf..00000000000
--- a/meta/conf/templates/default/conf-notes.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-### Shell environment set up for builds. ###
-
-You can now run 'bitbake <target>'
-
-Common targets are:
-    core-image-minimal
-    core-image-full-cmdline
-    core-image-sato
-    core-image-weston
-    meta-toolchain
-    meta-ide-support
-
-You can also run generated qemu images with a command like 'runqemu qemux86-64'.
-
-Other commonly useful commands are:
- - 'devtool' and 'recipetool' handle common recipe tasks
- - 'bitbake-layers' handles common layer tasks
- - 'oe-pkgdata-util' handles common target package tasks
-- 
2.39.2

[PATCH 2/2] meta-poky/conf/templates/default/conf-summary.txt: add a template summary

[Alexander Kanavin]

Existing conf-notes.txt is not adequate in situations where the user
needs to select a config template from several, or get an overview of them and
is interested only in a brief explanation of what the template is for,
but not extended multi-paragraph instructions for how to use it.

Such summaries can be provided via conf-summary.txt and
this patch adds such a summary for the poky default template.

Updates to the tools and a tool for selecting templates which
will make specific use of the summary will follow.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-poky/conf/templates/default/conf-summary.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 meta-poky/conf/templates/default/conf-summary.txt

diff --git a/meta-poky/conf/templates/default/conf-summary.txt b/meta-poky/conf/templates/default/conf-summary.txt
new file mode 100644
index 00000000000..8fc03030c7f
--- /dev/null
+++ b/meta-poky/conf/templates/default/conf-summary.txt
@@ -0,0 +1 @@
+This is the default build configuration for the Poky reference distribution.
-- 
2.39.2

Re: [poky] [PATCH 1/2] meta/conf/templates/default/conf-notes.txt: remove

[Richard Purdie]

On Fri, 2024-02-16 at 12:51 +0100, Alexander Kanavin wrote:
> This is present in the poky repository, even though it should
> not be:
> https://git.yoctoproject.org/poky/tree/meta/conf/templates/default
> 
> I couldn't find which tool leaves the file in place when combining
> oe-core/bitbake/meta-yocto repos into poky, so this patch is rather
> a request to point me to where it happens (or just fix it directly
> there).
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/conf/templates/default/conf-notes.txt | 19 -------------------
>  1 file changed, 19 deletions(-)
>  delete mode 100644 meta/conf/templates/default/conf-notes.txt

I think you misunderstand how the tool (combo-layer) works and where it
was aiming to go. It does combine the repositories together and whilst
some files are filtered, on the most part the repositories are meant to
be identical between poky and the derivatives, particularly for new
files. Over time the differences were meant to be removed.

I guess what you're saying is that the tooling is still unable to have
any kind of priority selection between the layers present?

The config is here:

https://git.yoctoproject.org/poky-config/tree/combo-layer.conf

specifically:

file_exclude = meta/conf/bblayers.conf.sample meta/conf/local.conf.sample meta/conf/local.conf.sample.extended meta/conf/site.conf.sample

but you will notice the exclusion lists are very small...

Cheers,

Richard

Re: [poky] [PATCH 1/2] meta/conf/templates/default/conf-notes.txt: remove

[Alexander Kanavin]

On Fri, 16 Feb 2024 at 16:33, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:

> The config is here:
>
> https://git.yoctoproject.org/poky-config/tree/combo-layer.conf
>
> specifically:
>
> file_exclude = meta/conf/bblayers.conf.sample meta/conf/local.conf.sample meta/conf/local.conf.sample.extended meta/conf/site.conf.sample
>
> but you will notice the exclusion lists are very small...

I still don't quite understand what is happening when poky is formed.
The above list refers to files in meta/conf/ that no longer even exist
(they've been moved to meta/conf/templates/default/), yet oe-core and
poky do have differences in the latter:

https://git.openembedded.org/openembedded-core/tree/meta/conf/templates/default
https://git.yoctoproject.org/poky/tree/meta/conf/templates/default

Is there's some other hidden config which lists the correct locations?

Alex

Re: [poky] [PATCH 1/2] meta/conf/templates/default/conf-notes.txt: remove

[Richard Purdie]

On Fri, 2024-02-16 at 16:48 +0100, Alexander Kanavin wrote:
> On Fri, 16 Feb 2024 at 16:33, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> 
> > The config is here:
> > 
> > https://git.yoctoproject.org/poky-config/tree/combo-layer.conf
> > 
> > specifically:
> > 
> > file_exclude = meta/conf/bblayers.conf.sample
> > meta/conf/local.conf.sample meta/conf/local.conf.sample.extended
> > meta/conf/site.conf.sample
> > 
> > but you will notice the exclusion lists are very small...
> 
> I still don't quite understand what is happening when poky is formed.
> The above list refers to files in meta/conf/ that no longer even
> exist
> (they've been moved to meta/conf/templates/default/), yet oe-core and
> poky do have differences in the latter:
> 
> https://git.openembedded.org/openembedded-core/tree/meta/conf/templates/default
> https://git.yoctoproject.org/poky/tree/meta/conf/templates/default
> 
> Is there's some other hidden config which lists the correct
> locations?

Nothing hidden or unmerged other than revision changes, I just checked.
I've probably just tried to manually resolve things not realising what
the issue was :(

Cheers,

Richard