[bitbake-devel] [PATCH] toaster: use https for clones, remove cgit in links in defaults
"Reyna, David" <[email protected]> Thu, 4 Jun 2026 18:51:22 +0000
| Newsgroups | org.openembedded.lists.bitbake-devel |
|---|---|
| Message-ID | <IA1PR11MB7677F6126AE7A7925853D7BAEA102@IA1PR11MB7677.namprd11.prod.outlook.com> |
From 6aaf733d340aacc5d3be3920d84976e7034166a2 Mon Sep 17 00:00:00 2001 From: David Reyna <mailto:[email protected]> Date: Thu, 4 Jun 2026 11:37:01 -0700 Subject: [PATCH] toaster: use https for clones, remove cgit in links in defaults The YP and OE repos have moved to "https:" instead of "git:" for cloning. YP has removed the "cgit/cgit.cgi" from web URLs for layers. This patch updates the fixture files that bootstrap these values for bitbake and the default layers. Also, fix Wrynose bitbake version. Note that Toaster is dependent on these values also fixed in the Layer Index (#16240). [YOCTO #16304] Signed-off-by: David Reyna <mailto:[email protected]> --- lib/toaster/orm/fixtures/gen_fixtures.py | 31 +++++++++++------- lib/toaster/orm/fixtures/poky.xml | 40 ++++++++++++------------ 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/lib/toaster/orm/fixtures/gen_fixtures.py b/lib/toaster/orm/fixtures/gen_fixtures.py index 8c03d9c9e..dda0b8196 100755 --- a/lib/toaster/orm/fixtures/gen_fixtures.py +++ b/lib/toaster/orm/fixtures/gen_fixtures.py @@ -35,7 +35,7 @@ verbose = False # [0=Codename, 1=Yocto Project Version, 2=Release Date, 3=Current Version, 4=Support Level, 5=Poky Version, 6=BitBake branch] current_releases = [ # Release slot #1 - ['Wrynose','6.0','April 2026','6.0 (April 2026)','Long Term Support (until April 2030)','','2.16'], + ['Wrynose','6.0','April 2026','6.0 (April 2026)','Long Term Support (until April 2030)','','2.18'], # Release slot #2 'local' ['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'], # Release slot #3 'master' @@ -81,7 +81,7 @@ prolog_template = '''\ bitbakeversion_poky_template = '''\ <object model="orm.bitbakeversion" pk="{{bitbake_id}}"> <field type="CharField" name="name">{{name}}</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">{{branch}}</field> <field type="CharField" name="dirpath"></field> </object> @@ -89,7 +89,7 @@ bitbakeversion_poky_template = '''\ bitbakeversion_oecore_template = '''\ <object model="orm.bitbakeversion" pk="{{bitbake_id}}"> <field type="CharField" name="name">{{name}}</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">{{bitbakeversion}}</field> </object> ''' @@ -247,7 +247,7 @@ def generate_poky(): params['description'] = 'Local Yocto Project' params['name'] = 'local' else: - params['help_source'] = 'using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/{{h_release}}">Yocto Project {{Release}} branch</a>' + params['help_source'] = 'using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/{{h_release}}">Yocto Project {{Release}} branch</a>' params['description'] = 'Yocto Project {{release_version}} "{{Release}}"' if 'master' == params['release']: params['h_release'] = '' @@ -280,10 +280,17 @@ def generate_poky(): params = {} params['layer'] = layer params['layer_id'] = str(i+1) - params['vcs_url'] = 'git://git.yoctoproject.org/poky' - params['vcs_web_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky' - params['vcs_web_tree_base_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%' - params['vcs_web_file_base_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%' + if 'openembedded-core' == layer: + params['vcs_url'] = 'https://git.openembedded.org/openembedded-core' + params['vcs_web_url'] = 'https://git.openembedded.org/openembedded-core' + params['vcs_web_tree_base_url'] = 'https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%' + params['vcs_web_file_base_url'] = 'https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%' + else: + # Yocto Project layers: meta-poky, meta-yocto-bsp + params['vcs_url'] = 'https://git.yoctoproject.org/meta-yocto' + params['vcs_web_url'] = 'https://git.yoctoproject.org/meta-yocto/tree' + params['vcs_web_tree_base_url'] = 'https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%' + params['vcs_web_file_base_url'] = 'https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%' if i: print_str('',fd) @@ -392,10 +399,10 @@ def generate_oe_core(): params = {} params['layer'] = layer params['layer_id'] = str(i+1) - params['vcs_url'] = 'git://git.openembedded.org/openembedded-core' - params['vcs_web_url'] = 'https://cgit.openembedded.org/openembedded-core' - params['vcs_web_tree_base_url'] = 'https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%' - params['vcs_web_file_base_url'] = 'https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%' + params['vcs_url'] = 'https://git.openembedded.org/openembedded-core' + params['vcs_web_url'] = 'https://git.openembedded.org/openembedded-core' + params['vcs_web_tree_base_url'] = 'https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%' + params['vcs_web_file_base_url'] = 'https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%' if i: print_str('',fd) print_template(layer_oe_core_template,params,fd) diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml index dd9ea3c1f..b1b3861d6 100644 --- a/lib/toaster/orm/fixtures/poky.xml +++ b/lib/toaster/orm/fixtures/poky.xml @@ -9,25 +9,25 @@ <!-- Bitbake versions which correspond to the metadata release --> <object model="orm.bitbakeversion" pk="1"> <field type="CharField" name="name">wrynose</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> - <field type="CharField" name="branch">2.16</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> + <field type="CharField" name="branch">2.18</field> <field type="CharField" name="dirpath"></field> </object> <object model="orm.bitbakeversion" pk="2"> <field type="CharField" name="name">HEAD</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">HEAD</field> <field type="CharField" name="dirpath"></field> </object> <object model="orm.bitbakeversion" pk="3"> <field type="CharField" name="name">master</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">master</field> <field type="CharField" name="dirpath"></field> </object> <object model="orm.bitbakeversion" pk="4"> <field type="CharField" name="name">scarthgap</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> + <field type="CharField" name="giturl">https://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">2.8</field> <field type="CharField" name="dirpath"></field> </object> @@ -39,7 +39,7 @@ <field type="CharField" name="description">Yocto Project 6.0 "Wrynose"</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> <field type="CharField" name="branch_name">wrynose</field> - <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=wrynose">Yocto Project Wrynose branch</a>.</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/?h=wrynose">Yocto Project Wrynose branch</a>.</field> </object> <object model="orm.release" pk="2"> <field type="CharField" name="name">local</field> @@ -53,14 +53,14 @@ <field type="CharField" name="description">Yocto Project master</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field> <field type="CharField" name="branch_name">master</field> - <field type="TextField" name="helptext">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>.</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/">Yocto Project Master branch</a>.</field> </object> <object model="orm.release" pk="4"> <field type="CharField" name="name">scarthgap</field> <field type="CharField" name="description">Yocto Project 5.0 "Scarthgap"</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> <field type="CharField" name="branch_name">scarthgap</field> - <field type="TextField" name="helptext">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>.</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="https://git.yoctoproject.org/meta-yocto/log/?h=scarthgap">Yocto Project Scarthgap branch</a>.</field> </object> <!-- Default project layers for each release --> @@ -121,10 +121,10 @@ <object model="orm.layer" pk="1"> <field type="CharField" name="name">openembedded-core</field> <field type="CharField" name="layer_index_url"></field> - <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> - <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> - <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> - <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_url">https://git.openembedded.org/openembedded-core</field> + <field type="CharField" name="vcs_web_url">https://git.openembedded.org/openembedded-core</field> + <field type="CharField" name="vcs_web_tree_base_url">https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_web_file_base_url">https://git.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field> </object> <object model="orm.layer_version" pk="1"> <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> @@ -159,10 +159,10 @@ <object model="orm.layer" pk="2"> <field type="CharField" name="name">meta-poky</field> <field type="CharField" name="layer_index_url"></field> - <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> - <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> - <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> - <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_url">https://git.yoctoproject.org/meta-yocto</field> + <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/meta-yocto/tree</field> + <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%</field> </object> <object model="orm.layer_version" pk="5"> <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> @@ -197,10 +197,10 @@ <object model="orm.layer" pk="3"> <field type="CharField" name="name">meta-yocto-bsp</field> <field type="CharField" name="layer_index_url"></field> - <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> - <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky</field> - <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> - <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_url">https://git.yoctoproject.org/meta-yocto</field> + <field type="CharField" name="vcs_web_url">https://git.yoctoproject.org/meta-yocto/tree</field> + <field type="CharField" name="vcs_web_tree_base_url">https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%</field> + <field type="CharField" name="vcs_web_file_base_url">https://git.yoctoproject.org/meta-yocto/tree/%path%?h=%branch%</field> </object> <object model="orm.layer_version" pk="9"> <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> -- 2.43.0