| Message ID | 20240216115153.3342614-1-alex@linutronix.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] meta/conf/templates/default/conf-notes.txt: remove | expand |
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
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
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
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
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