| Message ID | 20250123201215.2812931-1-detheridge@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-arago,oe-layersetup] configs: scarthgap update meta-browser layer sha | expand |
A more generic question: There are now multiple configs with meta-browser and meta-selinux listed: * arago-scarthgap: both meta-browser and meta-selinux are disabled * arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is disabled * arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is enabled Since there are now separate configs, should they be cleaned up and layers that are disabled or unused removed from them? That way when you need to bump say meta-browser, you just need to update one config, not all 3. Moreover, why only scarthgap is being updated? Are there any changes to the master configs? On Thu, Jan 23, 2025 at 02:12:15PM -0600, Etheridge, Darren via lists.yoctoproject.org wrote: > Update the various Scarthgap config files to point the meta-browser layer at the > correct sha for Chromium 130.0.6723.91. > > Signed-off-by: Darren Etheridge <detheridge@ti.com> > --- > configs/arago-scarthgap-chromium-config.txt | 2 +- > configs/arago-scarthgap-config.txt | 2 +- > configs/arago-scarthgap-next-config.txt | 2 +- > configs/arago-scarthgap-selinux-config.txt | 2 +- > configs/arago-scarthgap-wip-config.txt | 2 +- > kas/arago-scarthgap-chromium-config.yml | 2 +- > src/configs/arago-scarthgap-chromium-config.xml | 2 +- > src/configs/arago-scarthgap-config.xml | 2 +- > src/configs/arago-scarthgap-next-config.xml | 2 +- > src/configs/arago-scarthgap-selinux-config.xml | 2 +- > src/configs/arago-scarthgap-wip-config.xml | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/configs/arago-scarthgap-chromium-config.txt b/configs/arago-scarthgap-chromium-config.txt > index 9a1bd08..61d0bdb 100644 > --- a/configs/arago-scarthgap-chromium-config.txt > +++ b/configs/arago-scarthgap-chromium-config.txt > @@ -3,7 +3,7 @@ > > bitbake,https://git.openembedded.org/bitbake,2.8,HEAD > meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test > -meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium > +meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium > #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= > meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= > meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= > diff --git a/configs/arago-scarthgap-config.txt b/configs/arago-scarthgap-config.txt > index 3275f35..5c7adcb 100644 > --- a/configs/arago-scarthgap-config.txt > +++ b/configs/arago-scarthgap-config.txt > @@ -3,7 +3,7 @@ > > bitbake,https://git.openembedded.org/bitbake,2.8,HEAD > meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test > -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium > +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium > #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= > meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= > meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= > diff --git a/configs/arago-scarthgap-next-config.txt b/configs/arago-scarthgap-next-config.txt > index 58e8f96..8e96289 100644 > --- a/configs/arago-scarthgap-next-config.txt > +++ b/configs/arago-scarthgap-next-config.txt > @@ -11,7 +11,7 @@ MOTD: NOTE: > > bitbake,https://git.openembedded.org/bitbake,2.8,HEAD > meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test > -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium > +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium > #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= > meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= > meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= > diff --git a/configs/arago-scarthgap-selinux-config.txt b/configs/arago-scarthgap-selinux-config.txt > index 17dc6a4..79a1136 100644 > --- a/configs/arago-scarthgap-selinux-config.txt > +++ b/configs/arago-scarthgap-selinux-config.txt > @@ -3,7 +3,7 @@ > > bitbake,https://git.openembedded.org/bitbake,2.8,HEAD > meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test > -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium > +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium > meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= > meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= > meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= > diff --git a/configs/arago-scarthgap-wip-config.txt b/configs/arago-scarthgap-wip-config.txt > index 8dd69c8..4cc4556 100644 > --- a/configs/arago-scarthgap-wip-config.txt > +++ b/configs/arago-scarthgap-wip-config.txt > @@ -3,7 +3,7 @@ > > bitbake,https://git.openembedded.org/bitbake,2.8,HEAD > meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test > -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium > +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium > #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= > meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= > meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= > diff --git a/kas/arago-scarthgap-chromium-config.yml b/kas/arago-scarthgap-chromium-config.yml > index 35e9e36..a6d5a51 100644 > --- a/kas/arago-scarthgap-chromium-config.yml > +++ b/kas/arago-scarthgap-chromium-config.yml > @@ -19,7 +19,7 @@ repos: > meta-browser: > url: "https://github.com/OSSystems/meta-browser.git" > branch: "master" > - commit: "1ed2254d72a4c25879014c98be287a7e3e22904c" > + commit: "68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4" > layers: > meta-chromium: > > diff --git a/src/configs/arago-scarthgap-chromium-config.xml b/src/configs/arago-scarthgap-chromium-config.xml > index 6ccf049..739ab88 100644 > --- a/src/configs/arago-scarthgap-chromium-config.xml > +++ b/src/configs/arago-scarthgap-chromium-config.xml > @@ -17,7 +17,7 @@ > <layer>meta-arago-test</layer> > </layers> > </repo> > - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c'> > + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4'> > <layers> > <layer>meta-chromium</layer> > </layers> > diff --git a/src/configs/arago-scarthgap-config.xml b/src/configs/arago-scarthgap-config.xml > index 5efd7cc..dc960b4 100644 > --- a/src/configs/arago-scarthgap-config.xml > +++ b/src/configs/arago-scarthgap-config.xml > @@ -17,7 +17,7 @@ > <layer>meta-arago-test</layer> > </layers> > </repo> > - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> > + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> > <layers> > <layer>meta-chromium</layer> > </layers> > diff --git a/src/configs/arago-scarthgap-next-config.xml b/src/configs/arago-scarthgap-next-config.xml > index f31c917..b8c096d 100644 > --- a/src/configs/arago-scarthgap-next-config.xml > +++ b/src/configs/arago-scarthgap-next-config.xml > @@ -18,7 +18,7 @@ > <layer>meta-arago-test</layer> > </layers> > </repo> > - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> > + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> > <layers> > <layer>meta-chromium</layer> > </layers> > diff --git a/src/configs/arago-scarthgap-selinux-config.xml b/src/configs/arago-scarthgap-selinux-config.xml > index f0d8f14..e580d4c 100644 > --- a/src/configs/arago-scarthgap-selinux-config.xml > +++ b/src/configs/arago-scarthgap-selinux-config.xml > @@ -17,7 +17,7 @@ > <layer>meta-arago-test</layer> > </layers> > </repo> > - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> > + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> > <layers> > <layer>meta-chromium</layer> > </layers> > diff --git a/src/configs/arago-scarthgap-wip-config.xml b/src/configs/arago-scarthgap-wip-config.xml > index 667bf89..d330ef2 100644 > --- a/src/configs/arago-scarthgap-wip-config.xml > +++ b/src/configs/arago-scarthgap-wip-config.xml > @@ -17,7 +17,7 @@ > <layer>meta-arago-test</layer> > </layers> > </repo> > - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> > + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> > <layers> > <layer>meta-chromium</layer> > </layers> > -- > 2.34.1
On 1/23/2025 3:20 PM, Denys Dmytriyenko wrote: > A more generic question: > > There are now multiple configs with meta-browser and meta-selinux listed: > > * arago-scarthgap: both meta-browser and meta-selinux are disabled > * arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is disabled > * arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is enabled > > Since there are now separate configs, should they be cleaned up and layers > that are disabled or unused removed from them? That way when you need to bump > say meta-browser, you just need to update one config, not all 3. > This whole thing was a compromise because we didn't want to take the hit of building Chromium for every config. But we did want to give the ability to enable Chromium easily in every config. So we just comment it out and leave it up to the end user to uncomment it if they want Chromium to get built and burn several hours. Maybe there is a nicer way to do it, but at the time this is what we came up with that worked for everybody involved. > > Moreover, why only scarthgap is being updated? Are there any changes to the > master configs? > Master points to HEAD of the meta-browser layer, as such the recipes don't make any sense for master, as they really attempt to enable GPU support on a specific version of Chromium. If you build master you get whatever the latest Chromium is on the meta-browser layer without any of these tweaks applied. > > On Thu, Jan 23, 2025 at 02:12:15PM -0600, Etheridge, Darren via lists.yoctoproject.org wrote: >> Update the various Scarthgap config files to point the meta-browser layer at the >> correct sha for Chromium 130.0.6723.91. >> >> Signed-off-by: Darren Etheridge <detheridge@ti.com> >> --- >> configs/arago-scarthgap-chromium-config.txt | 2 +- >> configs/arago-scarthgap-config.txt | 2 +- >> configs/arago-scarthgap-next-config.txt | 2 +- >> configs/arago-scarthgap-selinux-config.txt | 2 +- >> configs/arago-scarthgap-wip-config.txt | 2 +- >> kas/arago-scarthgap-chromium-config.yml | 2 +- >> src/configs/arago-scarthgap-chromium-config.xml | 2 +- >> src/configs/arago-scarthgap-config.xml | 2 +- >> src/configs/arago-scarthgap-next-config.xml | 2 +- >> src/configs/arago-scarthgap-selinux-config.xml | 2 +- >> src/configs/arago-scarthgap-wip-config.xml | 2 +- >> 11 files changed, 11 insertions(+), 11 deletions(-) >> >> diff --git a/configs/arago-scarthgap-chromium-config.txt b/configs/arago-scarthgap-chromium-config.txt >> index 9a1bd08..61d0bdb 100644 >> --- a/configs/arago-scarthgap-chromium-config.txt >> +++ b/configs/arago-scarthgap-chromium-config.txt >> @@ -3,7 +3,7 @@ >> >> bitbake,https://git.openembedded.org/bitbake,2.8,HEAD >> meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test >> -meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium >> +meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium >> #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= >> meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= >> meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= >> diff --git a/configs/arago-scarthgap-config.txt b/configs/arago-scarthgap-config.txt >> index 3275f35..5c7adcb 100644 >> --- a/configs/arago-scarthgap-config.txt >> +++ b/configs/arago-scarthgap-config.txt >> @@ -3,7 +3,7 @@ >> >> bitbake,https://git.openembedded.org/bitbake,2.8,HEAD >> meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test >> -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium >> +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium >> #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= >> meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= >> meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= >> diff --git a/configs/arago-scarthgap-next-config.txt b/configs/arago-scarthgap-next-config.txt >> index 58e8f96..8e96289 100644 >> --- a/configs/arago-scarthgap-next-config.txt >> +++ b/configs/arago-scarthgap-next-config.txt >> @@ -11,7 +11,7 @@ MOTD: NOTE: >> >> bitbake,https://git.openembedded.org/bitbake,2.8,HEAD >> meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test >> -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium >> +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium >> #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= >> meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= >> meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= >> diff --git a/configs/arago-scarthgap-selinux-config.txt b/configs/arago-scarthgap-selinux-config.txt >> index 17dc6a4..79a1136 100644 >> --- a/configs/arago-scarthgap-selinux-config.txt >> +++ b/configs/arago-scarthgap-selinux-config.txt >> @@ -3,7 +3,7 @@ >> >> bitbake,https://git.openembedded.org/bitbake,2.8,HEAD >> meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test >> -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium >> +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium >> meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= >> meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= >> meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= >> diff --git a/configs/arago-scarthgap-wip-config.txt b/configs/arago-scarthgap-wip-config.txt >> index 8dd69c8..4cc4556 100644 >> --- a/configs/arago-scarthgap-wip-config.txt >> +++ b/configs/arago-scarthgap-wip-config.txt >> @@ -3,7 +3,7 @@ >> >> bitbake,https://git.openembedded.org/bitbake,2.8,HEAD >> meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test >> -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium >> +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium >> #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= >> meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= >> meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= >> diff --git a/kas/arago-scarthgap-chromium-config.yml b/kas/arago-scarthgap-chromium-config.yml >> index 35e9e36..a6d5a51 100644 >> --- a/kas/arago-scarthgap-chromium-config.yml >> +++ b/kas/arago-scarthgap-chromium-config.yml >> @@ -19,7 +19,7 @@ repos: >> meta-browser: >> url: "https://github.com/OSSystems/meta-browser.git" >> branch: "master" >> - commit: "1ed2254d72a4c25879014c98be287a7e3e22904c" >> + commit: "68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4" >> layers: >> meta-chromium: >> >> diff --git a/src/configs/arago-scarthgap-chromium-config.xml b/src/configs/arago-scarthgap-chromium-config.xml >> index 6ccf049..739ab88 100644 >> --- a/src/configs/arago-scarthgap-chromium-config.xml >> +++ b/src/configs/arago-scarthgap-chromium-config.xml >> @@ -17,7 +17,7 @@ >> <layer>meta-arago-test</layer> >> </layers> >> </repo> >> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c'> >> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4'> >> <layers> >> <layer>meta-chromium</layer> >> </layers> >> diff --git a/src/configs/arago-scarthgap-config.xml b/src/configs/arago-scarthgap-config.xml >> index 5efd7cc..dc960b4 100644 >> --- a/src/configs/arago-scarthgap-config.xml >> +++ b/src/configs/arago-scarthgap-config.xml >> @@ -17,7 +17,7 @@ >> <layer>meta-arago-test</layer> >> </layers> >> </repo> >> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> >> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> >> <layers> >> <layer>meta-chromium</layer> >> </layers> >> diff --git a/src/configs/arago-scarthgap-next-config.xml b/src/configs/arago-scarthgap-next-config.xml >> index f31c917..b8c096d 100644 >> --- a/src/configs/arago-scarthgap-next-config.xml >> +++ b/src/configs/arago-scarthgap-next-config.xml >> @@ -18,7 +18,7 @@ >> <layer>meta-arago-test</layer> >> </layers> >> </repo> >> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> >> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> >> <layers> >> <layer>meta-chromium</layer> >> </layers> >> diff --git a/src/configs/arago-scarthgap-selinux-config.xml b/src/configs/arago-scarthgap-selinux-config.xml >> index f0d8f14..e580d4c 100644 >> --- a/src/configs/arago-scarthgap-selinux-config.xml >> +++ b/src/configs/arago-scarthgap-selinux-config.xml >> @@ -17,7 +17,7 @@ >> <layer>meta-arago-test</layer> >> </layers> >> </repo> >> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> >> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> >> <layers> >> <layer>meta-chromium</layer> >> </layers> >> diff --git a/src/configs/arago-scarthgap-wip-config.xml b/src/configs/arago-scarthgap-wip-config.xml >> index 667bf89..d330ef2 100644 >> --- a/src/configs/arago-scarthgap-wip-config.xml >> +++ b/src/configs/arago-scarthgap-wip-config.xml >> @@ -17,7 +17,7 @@ >> <layer>meta-arago-test</layer> >> </layers> >> </repo> >> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> >> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> >> <layers> >> <layer>meta-chromium</layer> >> </layers> >> -- >> 2.34.1
On Fri, Jan 24, 2025 at 01:58:08PM -0600, Etheridge, Darren wrote: > On 1/23/2025 3:20 PM, Denys Dmytriyenko wrote: > >A more generic question: > > > >There are now multiple configs with meta-browser and meta-selinux listed: > > > >* arago-scarthgap: both meta-browser and meta-selinux are disabled > >* arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is disabled > >* arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is enabled > > > >Since there are now separate configs, should they be cleaned up and layers > >that are disabled or unused removed from them? That way when you need to bump > >say meta-browser, you just need to update one config, not all 3. > > > > This whole thing was a compromise because we didn't want to take the > hit of building Chromium for every config. But we did want to give > the ability to enable Chromium easily in every config. So we just > comment it out and leave it up to the end user to uncomment it if > they want Chromium to get built and burn several hours. Maybe there > is a nicer way to do it, but at the time this is what we came up > with that worked for everybody involved. Yes, back in Dunfell days this was exactly the case - there was a single main config file with meta-browser being commented out (as it also depended on deprecated Python2). Before that I kept it at an old commit that still allowed Chromium to be built with gcc and didn't require clang (and very long builds). Anyway, with Kirkstone and Scarthgap, you now have separate configs for builds with meta-browser/Chromium enabled, as well as meta-selinux enabled. My point being, since there are separate configus for such builds, why still keep commented out references in the main config? I.e. people can use arago-scarthgap-chromium config directly to get a build with Chromium enabled, instead of manually modifying the main arago-scarthgap config in order to enable Chromium... > >Moreover, why only scarthgap is being updated? Are there any changes to the > >master configs? > > Master points to HEAD of the meta-browser layer, as such the > recipes don't make any sense for master, as they really attempt to > enable GPU support on a specific version of Chromium. If you build > master you get whatever the latest Chromium is on the meta-browser > layer without any of these tweaks applied. Ah, yeah, missed the fact that master configs also have meta-browser pointing to the HEAD. Thanks for clarifying this.
On 1/28/2025 2:30 PM, Denys Dmytriyenko wrote: > On Fri, Jan 24, 2025 at 01:58:08PM -0600, Etheridge, Darren wrote: >> On 1/23/2025 3:20 PM, Denys Dmytriyenko wrote: >>> A more generic question: >>> >>> There are now multiple configs with meta-browser and meta-selinux listed: >>> >>> * arago-scarthgap: both meta-browser and meta-selinux are disabled >>> * arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is disabled >>> * arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is enabled >>> >>> Since there are now separate configs, should they be cleaned up and layers >>> that are disabled or unused removed from them? That way when you need to bump >>> say meta-browser, you just need to update one config, not all 3. >>> >> >> This whole thing was a compromise because we didn't want to take the >> hit of building Chromium for every config. But we did want to give >> the ability to enable Chromium easily in every config. So we just >> comment it out and leave it up to the end user to uncomment it if >> they want Chromium to get built and burn several hours. Maybe there >> is a nicer way to do it, but at the time this is what we came up >> with that worked for everybody involved. > > Yes, back in Dunfell days this was exactly the case - there was a single main > config file with meta-browser being commented out (as it also depended on > deprecated Python2). Before that I kept it at an old commit that still allowed > Chromium to be built with gcc and didn't require clang (and very long builds). > > Anyway, with Kirkstone and Scarthgap, you now have separate configs for builds > with meta-browser/Chromium enabled, as well as meta-selinux enabled. My point > being, since there are separate configus for such builds, why still keep > commented out references in the main config? > > I.e. people can use arago-scarthgap-chromium config directly to get a build > with Chromium enabled, instead of manually modifying the main arago-scarthgap > config in order to enable Chromium... I think part of the issue is if you use our "locked down" configs with the SHAs for each of the layers that each snapshot build produces, then you can just uncomment the line and move on. If it is a separate config, then you need to add the chromium line to the locked down config. Does that make sense? > >>> Moreover, why only scarthgap is being updated? Are there any changes to the >>> master configs? >> >> Master points to HEAD of the meta-browser layer, as such the >> recipes don't make any sense for master, as they really attempt to >> enable GPU support on a specific version of Chromium. If you build >> master you get whatever the latest Chromium is on the meta-browser >> layer without any of these tweaks applied. > > Ah, yeah, missed the fact that master configs also have meta-browser pointing > to the HEAD. Thanks for clarifying this. >
On 1/28/2025 2:43 PM, Ryan Eatmon wrote: > > > On 1/28/2025 2:30 PM, Denys Dmytriyenko wrote: >> On Fri, Jan 24, 2025 at 01:58:08PM -0600, Etheridge, Darren wrote: >>> On 1/23/2025 3:20 PM, Denys Dmytriyenko wrote: >>>> A more generic question: >>>> >>>> There are now multiple configs with meta-browser and meta-selinux >>>> listed: >>>> >>>> * arago-scarthgap: both meta-browser and meta-selinux are disabled >>>> * arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is >>>> disabled >>>> * arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is >>>> enabled >>>> >>>> Since there are now separate configs, should they be cleaned up and >>>> layers >>>> that are disabled or unused removed from them? That way when you >>>> need to bump >>>> say meta-browser, you just need to update one config, not all 3. >>>> >>> >>> This whole thing was a compromise because we didn't want to take the >>> hit of building Chromium for every config. But we did want to give >>> the ability to enable Chromium easily in every config. So we just >>> comment it out and leave it up to the end user to uncomment it if >>> they want Chromium to get built and burn several hours. Maybe there >>> is a nicer way to do it, but at the time this is what we came up >>> with that worked for everybody involved. >> >> Yes, back in Dunfell days this was exactly the case - there was a >> single main >> config file with meta-browser being commented out (as it also depended on >> deprecated Python2). Before that I kept it at an old commit that still >> allowed >> Chromium to be built with gcc and didn't require clang (and very long >> builds). >> >> Anyway, with Kirkstone and Scarthgap, you now have separate configs >> for builds >> with meta-browser/Chromium enabled, as well as meta-selinux enabled. >> My point >> being, since there are separate configus for such builds, why still keep >> commented out references in the main config? >> >> I.e. people can use arago-scarthgap-chromium config directly to get a >> build >> with Chromium enabled, instead of manually modifying the main >> arago-scarthgap >> config in order to enable Chromium... > > I think part of the issue is if you use our "locked down" configs with > the SHAs for each of the layers that each snapshot build produces, then > you can just uncomment the line and move on. If it is a separate > config, then you need to add the chromium line to the locked down > config. Does that make sense? > This is exactly what our Jenkins job does to test RC's with Chromium enabled. It also sort of implicitly keeps the version of Chromium that is tested with any release easily accessible from any of the configs. Although I agree this can be achieved through other means. > > >> >>>> Moreover, why only scarthgap is being updated? Are there any changes >>>> to the >>>> master configs? >>> >>> Master points to HEAD of the meta-browser layer, as such the >>> recipes don't make any sense for master, as they really attempt to >>> enable GPU support on a specific version of Chromium. If you build >>> master you get whatever the latest Chromium is on the meta-browser >>> layer without any of these tweaks applied. >> >> Ah, yeah, missed the fact that master configs also have meta-browser >> pointing >> to the HEAD. Thanks for clarifying this. >> >
On Tue, Jan 28, 2025 at 02:43:25PM -0600, Ryan Eatmon wrote: > On 1/28/2025 2:30 PM, Denys Dmytriyenko wrote: > >On Fri, Jan 24, 2025 at 01:58:08PM -0600, Etheridge, Darren wrote: > >>On 1/23/2025 3:20 PM, Denys Dmytriyenko wrote: > >>>A more generic question: > >>> > >>>There are now multiple configs with meta-browser and meta-selinux listed: > >>> > >>>* arago-scarthgap: both meta-browser and meta-selinux are disabled > >>>* arago-scarthgap-chromium: meta-browser is enabled, meta-selinux is disabled > >>>* arago-scarthgap-selinux: meta-browser is disabled, meta-selinux is enabled > >>> > >>>Since there are now separate configs, should they be cleaned up and layers > >>>that are disabled or unused removed from them? That way when you need to bump > >>>say meta-browser, you just need to update one config, not all 3. > >>> > >> > >>This whole thing was a compromise because we didn't want to take the > >>hit of building Chromium for every config. But we did want to give > >>the ability to enable Chromium easily in every config. So we just > >>comment it out and leave it up to the end user to uncomment it if > >>they want Chromium to get built and burn several hours. Maybe there > >>is a nicer way to do it, but at the time this is what we came up > >>with that worked for everybody involved. > > > >Yes, back in Dunfell days this was exactly the case - there was a single main > >config file with meta-browser being commented out (as it also depended on > >deprecated Python2). Before that I kept it at an old commit that still allowed > >Chromium to be built with gcc and didn't require clang (and very long builds). > > > >Anyway, with Kirkstone and Scarthgap, you now have separate configs for builds > >with meta-browser/Chromium enabled, as well as meta-selinux enabled. My point > >being, since there are separate configus for such builds, why still keep > >commented out references in the main config? > > > >I.e. people can use arago-scarthgap-chromium config directly to get a build > >with Chromium enabled, instead of manually modifying the main arago-scarthgap > >config in order to enable Chromium... > > I think part of the issue is if you use our "locked down" configs > with the SHAs for each of the layers that each snapshot build > produces, then you can just uncomment the line and move on. If it > is a separate config, then you need to add the chromium line to the > locked down config. Does that make sense? Hmm, are those locked down configs available anywhere, or are those internal only? Either way, I was just looking at making everyone's life easier, but if the opposite is easier for your workflow, so be it :)
diff --git a/configs/arago-scarthgap-chromium-config.txt b/configs/arago-scarthgap-chromium-config.txt index 9a1bd08..61d0bdb 100644 --- a/configs/arago-scarthgap-chromium-config.txt +++ b/configs/arago-scarthgap-chromium-config.txt @@ -3,7 +3,7 @@ bitbake,https://git.openembedded.org/bitbake,2.8,HEAD meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test -meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium +meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= diff --git a/configs/arago-scarthgap-config.txt b/configs/arago-scarthgap-config.txt index 3275f35..5c7adcb 100644 --- a/configs/arago-scarthgap-config.txt +++ b/configs/arago-scarthgap-config.txt @@ -3,7 +3,7 @@ bitbake,https://git.openembedded.org/bitbake,2.8,HEAD meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= diff --git a/configs/arago-scarthgap-next-config.txt b/configs/arago-scarthgap-next-config.txt index 58e8f96..8e96289 100644 --- a/configs/arago-scarthgap-next-config.txt +++ b/configs/arago-scarthgap-next-config.txt @@ -11,7 +11,7 @@ MOTD: NOTE: bitbake,https://git.openembedded.org/bitbake,2.8,HEAD meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= diff --git a/configs/arago-scarthgap-selinux-config.txt b/configs/arago-scarthgap-selinux-config.txt index 17dc6a4..79a1136 100644 --- a/configs/arago-scarthgap-selinux-config.txt +++ b/configs/arago-scarthgap-selinux-config.txt @@ -3,7 +3,7 @@ bitbake,https://git.openembedded.org/bitbake,2.8,HEAD meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= diff --git a/configs/arago-scarthgap-wip-config.txt b/configs/arago-scarthgap-wip-config.txt index 8dd69c8..4cc4556 100644 --- a/configs/arago-scarthgap-wip-config.txt +++ b/configs/arago-scarthgap-wip-config.txt @@ -3,7 +3,7 @@ bitbake,https://git.openembedded.org/bitbake,2.8,HEAD meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test -#meta-browser,https://github.com/OSSystems/meta-browser.git,master,1ed2254d72a4c25879014c98be287a7e3e22904c,layers=meta-chromium +#meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers= meta-virtualization,https://git.yoctoproject.org/meta-virtualization,scarthgap,HEAD,layers= diff --git a/kas/arago-scarthgap-chromium-config.yml b/kas/arago-scarthgap-chromium-config.yml index 35e9e36..a6d5a51 100644 --- a/kas/arago-scarthgap-chromium-config.yml +++ b/kas/arago-scarthgap-chromium-config.yml @@ -19,7 +19,7 @@ repos: meta-browser: url: "https://github.com/OSSystems/meta-browser.git" branch: "master" - commit: "1ed2254d72a4c25879014c98be287a7e3e22904c" + commit: "68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4" layers: meta-chromium: diff --git a/src/configs/arago-scarthgap-chromium-config.xml b/src/configs/arago-scarthgap-chromium-config.xml index 6ccf049..739ab88 100644 --- a/src/configs/arago-scarthgap-chromium-config.xml +++ b/src/configs/arago-scarthgap-chromium-config.xml @@ -17,7 +17,7 @@ <layer>meta-arago-test</layer> </layers> </repo> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c'> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4'> <layers> <layer>meta-chromium</layer> </layers> diff --git a/src/configs/arago-scarthgap-config.xml b/src/configs/arago-scarthgap-config.xml index 5efd7cc..dc960b4 100644 --- a/src/configs/arago-scarthgap-config.xml +++ b/src/configs/arago-scarthgap-config.xml @@ -17,7 +17,7 @@ <layer>meta-arago-test</layer> </layers> </repo> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> <layers> <layer>meta-chromium</layer> </layers> diff --git a/src/configs/arago-scarthgap-next-config.xml b/src/configs/arago-scarthgap-next-config.xml index f31c917..b8c096d 100644 --- a/src/configs/arago-scarthgap-next-config.xml +++ b/src/configs/arago-scarthgap-next-config.xml @@ -18,7 +18,7 @@ <layer>meta-arago-test</layer> </layers> </repo> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> <layers> <layer>meta-chromium</layer> </layers> diff --git a/src/configs/arago-scarthgap-selinux-config.xml b/src/configs/arago-scarthgap-selinux-config.xml index f0d8f14..e580d4c 100644 --- a/src/configs/arago-scarthgap-selinux-config.xml +++ b/src/configs/arago-scarthgap-selinux-config.xml @@ -17,7 +17,7 @@ <layer>meta-arago-test</layer> </layers> </repo> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> <layers> <layer>meta-chromium</layer> </layers> diff --git a/src/configs/arago-scarthgap-wip-config.xml b/src/configs/arago-scarthgap-wip-config.xml index 667bf89..d330ef2 100644 --- a/src/configs/arago-scarthgap-wip-config.xml +++ b/src/configs/arago-scarthgap-wip-config.xml @@ -17,7 +17,7 @@ <layer>meta-arago-test</layer> </layers> </repo> - <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='1ed2254d72a4c25879014c98be287a7e3e22904c' disabled='true'> + <repo name='meta-browser' url='https://github.com/OSSystems/meta-browser.git' branch='master' commit='68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4' disabled='true'> <layers> <layer>meta-chromium</layer> </layers>
Update the various Scarthgap config files to point the meta-browser layer at the correct sha for Chromium 130.0.6723.91. Signed-off-by: Darren Etheridge <detheridge@ti.com> --- configs/arago-scarthgap-chromium-config.txt | 2 +- configs/arago-scarthgap-config.txt | 2 +- configs/arago-scarthgap-next-config.txt | 2 +- configs/arago-scarthgap-selinux-config.txt | 2 +- configs/arago-scarthgap-wip-config.txt | 2 +- kas/arago-scarthgap-chromium-config.yml | 2 +- src/configs/arago-scarthgap-chromium-config.xml | 2 +- src/configs/arago-scarthgap-config.xml | 2 +- src/configs/arago-scarthgap-next-config.xml | 2 +- src/configs/arago-scarthgap-selinux-config.xml | 2 +- src/configs/arago-scarthgap-wip-config.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)