From 761a03a7b25f443a02bd92b5c3874ad3d392978a Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 11 Jun 2024 09:13:32 -0700 Subject: [PATCH] bitbake: taoster: update fixtures for scarthgap, current gen_fixtures.py: * Add Scarthgap to slot #1 * Drop EOL Mickledore * Move Kirkstone to lower slot * Drop optional slot for EOL Dunfell Refresh oe-core.xml and poky.xml (Bitbake rev: 11c7214a292cd296eed5490b6726e672f9179131) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../lib/toaster/orm/fixtures/gen_fixtures.py | 8 +- bitbake/lib/toaster/orm/fixtures/oe-core.xml | 40 +++----- bitbake/lib/toaster/orm/fixtures/poky.xml | 98 +++++-------------- 3 files changed, 43 insertions(+), 103 deletions(-) diff --git a/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py b/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py index 71afe3914e..5f43400cdc 100755 --- a/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py +++ b/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py @@ -35,19 +35,21 @@ verbose = False # [Codename, Yocto Project Version, Release Date, Current Version, Support Level, Poky Version, BitBake branch] current_releases = [ # Release slot #1 - ['Kirkstone','4.0','April 2022','4.0.8 (March 2023)','Stable - Long Term Support (until Apr. 2024)','','2.0'], + ['Scarthgap','5.0','April 2024','5.0.0 (April 2024)','Long Term Support (until April 2028)','','2.8'], # Release slot #2 'local' ['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'], # Release slot #3 'master' ['Master','master','','Yocto Project master','master','','master'], # Release slot #4 - ['Mickledore','4.2','April 2023','4.2.0 (April 2023)','Support for 7 months (until October 2023)','','2.4'], +# ['Nanbield','4.3','November 2023','4.3.0 (November 2023)','Support for 7 months (until May 2024)','','2.6'], +# ['Mickledore','4.2','April 2023','4.2.0 (April 2023)','Support for 7 months (until October 2023)','','2.4'], # ['Langdale','4.1','October 2022','4.1.2 (January 2023)','Support for 7 months (until May 2023)','','2.2'], + ['Kirkstone','4.0','April 2022','4.0.8 (March 2023)','Stable - Long Term Support (until Apr. 2024)','','2.0'], # ['Honister','3.4','October 2021','3.4.2 (February 2022)','Support for 7 months (until May 2022)','26.0','1.52'], # ['Hardknott','3.3','April 2021','3.3.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','25.0','1.50'], # ['Gatesgarth','3.2','Oct 2020','3.2.4 (May 2021)','EOL','24.0','1.48'], # Optional Release slot #5 - ['Dunfell','3.1','April 2020','3.1.23 (February 2023)','Stable - Long Term Support (until Apr. 2024)','23.0','1.46'], + #['Dunfell','3.1','April 2020','3.1.23 (February 2023)','Stable - Long Term Support (until Apr. 2024)','23.0','1.46'], ] default_poky_layers = [ diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml index 950f2a98af..d381027c7b 100644 --- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml +++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml @@ -8,9 +8,9 @@ - kirkstone + scarthgap git://git.openembedded.org/bitbake - 2.0 + 2.8 HEAD @@ -23,23 +23,18 @@ master - mickledore + kirkstone git://git.openembedded.org/bitbake - 2.4 - - - dunfell - git://git.openembedded.org/bitbake - 1.46 + 2.0 - kirkstone - Openembedded Kirkstone + scarthgap + Openembedded Scarthgap 1 - kirkstone - Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=kirkstone\">OpenEmbedded Kirkstone</a> branch. + scarthgap + Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=scarthgap\">OpenEmbedded Scarthgap</a> branch. local @@ -56,18 +51,11 @@ Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch. - mickledore - Openembedded Mickledore + kirkstone + Openembedded Kirkstone 4 - mickledore - Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=mickledore\">OpenEmbedded Mickledore</a> branch. - - - dunfell - Openembedded Dunfell - 5 - dunfell - Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=dunfell\">OpenEmbedded Dunfell</a> branch. + kirkstone + Toaster will run your builds using the tip of the <a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=kirkstone\">OpenEmbedded Kirkstone</a> branch. @@ -87,10 +75,6 @@ 4 openembedded-core - - 5 - openembedded-core - diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml index 121e52fd45..21355aeb7b 100644 --- a/bitbake/lib/toaster/orm/fixtures/poky.xml +++ b/bitbake/lib/toaster/orm/fixtures/poky.xml @@ -8,9 +8,9 @@ - kirkstone + scarthgap git://git.yoctoproject.org/poky - kirkstone + scarthgap bitbake @@ -26,26 +26,20 @@ bitbake - mickledore + kirkstone git://git.yoctoproject.org/poky - mickledore - bitbake - - - dunfell - git://git.yoctoproject.org/poky - dunfell + kirkstone bitbake - kirkstone - Yocto Project 4.0 "Kirkstone" + scarthgap + Yocto Project 5.0 "Scarthgap" 1 - kirkstone - Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=kirkstone">Yocto Project Kirkstone branch</a>. + scarthgap + Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=scarthgap">Yocto Project Scarthgap branch</a>. local @@ -62,18 +56,11 @@ Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project Master branch</a>. - mickledore - Yocto Project 4.2 "Mickledore" + kirkstone + Yocto Project 4.0 "Kirkstone" 4 - mickledore - Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=mickledore">Yocto Project Mickledore branch</a>. - - - dunfell - Yocto Project 3.1 "Dunfell" - 5 - dunfell - Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dunfell">Yocto Project Dunfell branch</a>. + kirkstone + Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=kirkstone">Yocto Project Kirkstone branch</a>. @@ -125,18 +112,6 @@ 4 meta-yocto-bsp - - 5 - openembedded-core - - - 5 - meta-poky - - - 5 - meta-yocto-bsp -