[meta-arago,oe-layersetup,6/6] Build Poky using meta-yocto instead of combined poky repo

Message ID 20220426200251.19417-6-afd@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,oe-layersetup,1/6] Remove unused sample-file bblayers-zeus-browser.conf.sample | expand

Commit Message

Andrew Davis April 26, 2022, 8:02 p.m. UTC
The Poky repo contains meta-yocto plus extra bits needed for an
all-in-one build, but since we already pull in tools with this
script like bitbake and oe-core, lets use those and save some
space/bandwidth.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 configs/poky-master-config.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Denys Dmytriyenko April 26, 2022, 9:18 p.m. UTC | #1
On Tue, Apr 26, 2022 at 03:02:51PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> The Poky repo contains meta-yocto plus extra bits needed for an
> all-in-one build, but since we already pull in tools with this
> script like bitbake and oe-core, lets use those and save some
> space/bandwidth.

There are other nuances of "flattened" Poky repo (commits are different, 
plus some other minor bits and pieces). The only overhead is to clone Bitbake 
twice (not OE-Core), which is neglectable and allows building the true Poky, 
instead of OE-Core + meta-yocto/meta-poky... :)


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  configs/poky-master-config.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
> index b395ff8..a541501 100644
> --- a/configs/poky-master-config.txt
> +++ b/configs/poky-master-config.txt
> @@ -1,8 +1,10 @@
>  # This file takes repo entries in the format
>  # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
> +
>  bitbake,git://git.openembedded.org/bitbake,master,HEAD
> -poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp
> +meta-yocto,git://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
>  meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp
>  meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
> +oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
>  OECORELAYERCONF=./sample-files/bblayers.conf.sample
>  OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
> -- 
> 2.17.1
Andrew Davis April 26, 2022, 9:29 p.m. UTC | #2
On 4/26/22 4:18 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 26, 2022 at 03:02:51PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
>> The Poky repo contains meta-yocto plus extra bits needed for an
>> all-in-one build, but since we already pull in tools with this
>> script like bitbake and oe-core, lets use those and save some
>> space/bandwidth.
> 
> There are other nuances of "flattened" Poky repo (commits are different,
> plus some other minor bits and pieces). The only overhead is to clone Bitbake
> twice (not OE-Core), which is neglectable and allows building the true Poky,
> instead of OE-Core + meta-yocto/meta-poky... :)
> 


Could you let me know what the other "minor bits and pieces" we are concerned
about losing here? It seems the "flattened" Poky repo is an automatic merge of
Bitbake + OE-Core + meta-yocto/meta-poky + some random scripts we don't care about
since we do the same thing here in oe-layersetup.

If we want "true" Poky, then we just clone flattened Poky and don't need
oe-layersetup at all here.

Andrew


> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   configs/poky-master-config.txt | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
>> index b395ff8..a541501 100644
>> --- a/configs/poky-master-config.txt
>> +++ b/configs/poky-master-config.txt
>> @@ -1,8 +1,10 @@
>>   # This file takes repo entries in the format
>>   # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
>> +
>>   bitbake,git://git.openembedded.org/bitbake,master,HEAD
>> -poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp
>> +meta-yocto,git://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
>>   meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp
>>   meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
>> +oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
>>   OECORELAYERCONF=./sample-files/bblayers.conf.sample
>>   OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
>> -- 
>> 2.17.1
Denys Dmytriyenko April 28, 2022, 12:04 a.m. UTC | #3
On Tue, Apr 26, 2022 at 04:29:53PM -0500, Andrew Davis wrote:
> On 4/26/22 4:18 PM, Denys Dmytriyenko wrote:
> >On Tue, Apr 26, 2022 at 03:02:51PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> >>The Poky repo contains meta-yocto plus extra bits needed for an
> >>all-in-one build, but since we already pull in tools with this
> >>script like bitbake and oe-core, lets use those and save some
> >>space/bandwidth.
> >
> >There are other nuances of "flattened" Poky repo (commits are different,
> >plus some other minor bits and pieces). The only overhead is to clone Bitbake
> >twice (not OE-Core), which is neglectable and allows building the true Poky,
> >instead of OE-Core + meta-yocto/meta-poky... :)
> >
> 
> 
> Could you let me know what the other "minor bits and pieces" we are concerned
> about losing here? It seems the "flattened" Poky repo is an automatic merge of
> Bitbake + OE-Core + meta-yocto/meta-poky + some random scripts we don't care about
> since we do the same thing here in oe-layersetup.
> 
> If we want "true" Poky, then we just clone flattened Poky and don't need
> oe-layersetup at all here.

Yeah, the biggest difference is all the different commit IDs between all 
those layers due to running combo-layer tool, which I don't believe runs 
automatically anyway. And, sure, combo-layer was one of the ways to do layer 
setup, vs. oe-layersetup tool. But since I wanted to do Poky builds with 
meta-ti on the same build farm with Arago, which uses tisdk-build-scripts 
and oe-layersetup, adding this config back then was the simplest approach. 
And if this is no longer used/needed, you can definitely change or remove 
it...


> >>Signed-off-by: Andrew Davis <afd@ti.com>
> >>---
> >>  configs/poky-master-config.txt | 4 +++-
> >>  1 file changed, 3 insertions(+), 1 deletion(-)
> >>
> >>diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
> >>index b395ff8..a541501 100644
> >>--- a/configs/poky-master-config.txt
> >>+++ b/configs/poky-master-config.txt
> >>@@ -1,8 +1,10 @@
> >>  # This file takes repo entries in the format
> >>  # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
> >>+
> >>  bitbake,git://git.openembedded.org/bitbake,master,HEAD
> >>-poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp
> >>+meta-yocto,git://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
> >>  meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp
> >>  meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
> >>+oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
> >>  OECORELAYERCONF=./sample-files/bblayers.conf.sample
> >>  OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
> >>-- 
> >>2.17.1

Patch

diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
index b395ff8..a541501 100644
--- a/configs/poky-master-config.txt
+++ b/configs/poky-master-config.txt
@@ -1,8 +1,10 @@ 
 # This file takes repo entries in the format
 # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
+
 bitbake,git://git.openembedded.org/bitbake,master,HEAD
-poky,git://git.yoctoproject.org/poky,master,HEAD,layers=meta:meta-poky:meta-yocto-bsp
+meta-yocto,git://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
 meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp
 meta-arm,git://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
+oe-core,git://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
 OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample