[meta-arago,oe-layersetup,2/6] Add layers for split meta-ti master branch

Message ID 20220426200251.19417-2-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 latest master meta-ti split into two layers, add new layers here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 configs/arago-master-config.txt      | 2 +-
 configs/distroless-master-config.txt | 2 +-
 configs/poky-master-config.txt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Denys Dmytriyenko April 26, 2022, 9:09 p.m. UTC | #1
On Tue, Apr 26, 2022 at 03:02:47PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> The latest master meta-ti split into two layers, add new layers here.

Can you swap the order of layers in meta-ti?
Other repos usually have the main repo listed first.


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  configs/arago-master-config.txt      | 2 +-
>  configs/distroless-master-config.txt | 2 +-
>  configs/poky-master-config.txt       | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
> index bd0ccec..532a145 100644
> --- a/configs/arago-master-config.txt
> +++ b/configs/arago-master-config.txt
> @@ -7,7 +7,7 @@ meta-arago,git://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-d
>  meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
>  meta-virtualization,git://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
>  meta-openembedded,git://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems
> -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
> +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
> diff --git a/configs/distroless-master-config.txt b/configs/distroless-master-config.txt
> index 8211bd5..5c55459 100644
> --- a/configs/distroless-master-config.txt
> +++ b/configs/distroless-master-config.txt
> @@ -1,7 +1,7 @@
>  # 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
> -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
> +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
> diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
> index f213411..b395ff8 100644
> --- a/configs/poky-master-config.txt
> +++ b/configs/poky-master-config.txt
> @@ -2,7 +2,7 @@
>  # 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-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
> +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
>  OECORELAYERCONF=./sample-files/bblayers.conf.sample
>  OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
> -- 
> 2.17.1
Andrew Davis April 26, 2022, 9:18 p.m. UTC | #2
On 4/26/22 4:09 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 26, 2022 at 03:02:47PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
>> The latest master meta-ti split into two layers, add new layers here.
> 
> Can you swap the order of layers in meta-ti?
> Other repos usually have the main repo listed first.
> 


That changes the order they go into to bblayers, don't we want
meta-ti-bsp to be the bottom layer?

Andrew


> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   configs/arago-master-config.txt      | 2 +-
>>   configs/distroless-master-config.txt | 2 +-
>>   configs/poky-master-config.txt       | 2 +-
>>   3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
>> index bd0ccec..532a145 100644
>> --- a/configs/arago-master-config.txt
>> +++ b/configs/arago-master-config.txt
>> @@ -7,7 +7,7 @@ meta-arago,git://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-d
>>   meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
>>   meta-virtualization,git://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
>>   meta-openembedded,git://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems
>> -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
>> +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
>> diff --git a/configs/distroless-master-config.txt b/configs/distroless-master-config.txt
>> index 8211bd5..5c55459 100644
>> --- a/configs/distroless-master-config.txt
>> +++ b/configs/distroless-master-config.txt
>> @@ -1,7 +1,7 @@
>>   # 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
>> -meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
>> +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
>> diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
>> index f213411..b395ff8 100644
>> --- a/configs/poky-master-config.txt
>> +++ b/configs/poky-master-config.txt
>> @@ -2,7 +2,7 @@
>>   # 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-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
>> +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
>>   OECORELAYERCONF=./sample-files/bblayers.conf.sample
>>   OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample
>> -- 
>> 2.17.1
Denys Dmytriyenko April 26, 2022, 9:27 p.m. UTC | #3
On Tue, Apr 26, 2022 at 04:18:18PM -0500, Andrew Davis wrote:
> On 4/26/22 4:09 PM, Denys Dmytriyenko wrote:
> >On Tue, Apr 26, 2022 at 03:02:47PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> >>The latest master meta-ti split into two layers, add new layers here.
> >
> >Can you swap the order of layers in meta-ti?
> >Other repos usually have the main repo listed first.
> 
> 
> That changes the order they go into to bblayers, don't we want
> meta-ti-bsp to be the bottom layer?

Right, the order of entries in bblayers.conf affects the way "shadowed" config 
files are parsed/visible.

So, if you eventually want a same-named config file from meta-ti-extras to 
override the same config file from meta-ti-bsp, then this order is correct. 
But I'd be very cautious overriding each other config files from layers in the 
same repo...

Anyway, I retract my comment:

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>

Patch

diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
index bd0ccec..532a145 100644
--- a/configs/arago-master-config.txt
+++ b/configs/arago-master-config.txt
@@ -7,7 +7,7 @@  meta-arago,git://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-d
 meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
 meta-virtualization,git://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
 meta-openembedded,git://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems
-meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
+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
diff --git a/configs/distroless-master-config.txt b/configs/distroless-master-config.txt
index 8211bd5..5c55459 100644
--- a/configs/distroless-master-config.txt
+++ b/configs/distroless-master-config.txt
@@ -1,7 +1,7 @@ 
 # 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
-meta-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
+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
diff --git a/configs/poky-master-config.txt b/configs/poky-master-config.txt
index f213411..b395ff8 100644
--- a/configs/poky-master-config.txt
+++ b/configs/poky-master-config.txt
@@ -2,7 +2,7 @@ 
 # 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-ti,git://git.yoctoproject.org/meta-ti,master,HEAD,layers=
+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
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
 OECORELOCALCONF=./sample-files/local-poky-v2.conf.sample