[PATCH v4 3/4] bitbake-setup: use URI shortcut for all configurations

Corentin Guillevic
2025-12-19T16:13:10Z

Currently, no source has several remotes. So we can replace their entire
structure 'remote' -> 'origin' -> 'uri' with a shorter one (property 'uri'
only).

Signed-off-by: Corentin Guillevic <corentin.guillevic@smile.fr>
---
.../oe-nodistro-master.conf.json | 18 +++-----------
.../oe-nodistro-whinlatter.conf.json | 18 +++-----------
.../configurations/poky-master.conf.json | 24 ++++---------------
.../configurations/poky-whinlatter.conf.json | 24 ++++---------------
4 files changed, 14 insertions(+), 70 deletions(-)

diff --git a/default-registry/configurations/oe-nodistro-master.conf.json b/default-registry/configurations/oe-nodistro-master.conf.json
index 180d2008a..e4e842177 100644
--- a/default-registry/configurations/oe-nodistro-master.conf.json
+++ b/default-registry/configurations/oe-nodistro-master.conf.json
@@ -3,33 +3,21 @@
"sources": {
"bitbake": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/bitbake"
- }
- },
+ "uri": "https://git.openembedded.org/bitbake",
"branch": "master",
"rev": "master"
}
},
"openembedded-core": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/openembedded-core"
- }
- },
+ "uri": "https://git.openembedded.org/openembedded-core",
"branch": "master",
"rev": "master"
}
},
"yocto-docs": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/yocto-docs"
- }
- },
+ "uri": "https://git.yoctoproject.org/yocto-docs",
"branch": "master",
"rev": "master"
}
diff --git a/default-registry/configurations/oe-nodistro-whinlatter.conf.json b/default-registry/configurations/oe-nodistro-whinlatter.conf.json
index 7b183ae1c..8342f2cf5 100644
--- a/default-registry/configurations/oe-nodistro-whinlatter.conf.json
+++ b/default-registry/configurations/oe-nodistro-whinlatter.conf.json
@@ -4,33 +4,21 @@
"sources": {
"bitbake": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/bitbake"
- }
- },
+ "uri": "https://git.openembedded.org/bitbake",
"branch": "2.16",
"rev": "2.16"
}
},
"openembedded-core": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/openembedded-core"
- }
- },
+ "uri": "https://git.openembedded.org/openembedded-core",
"branch": "whinlatter",
"rev": "whinlatter"
}
},
"yocto-docs": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/yocto-docs"
- }
- },
+ "uri": "https://git.yoctoproject.org/yocto-docs",
"branch": "whinlatter",
"rev": "whinlatter"
}
diff --git a/default-registry/configurations/poky-master.conf.json b/default-registry/configurations/poky-master.conf.json
index 1de038bab..82464e8ab 100644
--- a/default-registry/configurations/poky-master.conf.json
+++ b/default-registry/configurations/poky-master.conf.json
@@ -3,44 +3,28 @@
"sources": {
"bitbake": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/bitbake"
- }
- },
+ "uri": "https://git.openembedded.org/bitbake",
"branch": "master",
"rev": "master"
}
},
"openembedded-core": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/openembedded-core"
- }
- },
+ "uri": "https://git.openembedded.org/openembedded-core",
"branch": "master",
"rev": "master"
}
},
"meta-yocto": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/meta-yocto"
- }
- },
+ "uri": "https://git.yoctoproject.org/meta-yocto",
"branch": "master",
"rev": "master"
}
},
"yocto-docs": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/yocto-docs"
- }
- },
+ "uri": "https://git.yoctoproject.org/yocto-docs",
"branch": "master",
"rev": "master"
}
diff --git a/default-registry/configurations/poky-whinlatter.conf.json b/default-registry/configurations/poky-whinlatter.conf.json
index bfa67426d..80b3c7f8c 100644
--- a/default-registry/configurations/poky-whinlatter.conf.json
+++ b/default-registry/configurations/poky-whinlatter.conf.json
@@ -4,44 +4,28 @@
"sources": {
"bitbake": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/bitbake"
- }
- },
+ "uri": "https://git.openembedded.org/bitbake",
"branch": "2.16",
"rev": "2.16"
}
},
"openembedded-core": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.openembedded.org/openembedded-core"
- }
- },
+ "uri": "https://git.openembedded.org/openembedded-core",
"branch": "whinlatter",
"rev": "whinlatter"
}
},
"meta-yocto": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/meta-yocto"
- }
- },
+ "uri": "https://git.yoctoproject.org/meta-yocto",
"branch": "whinlatter",
"rev": "whinlatter"
}
},
"yocto-docs": {
"git-remote": {
- "remotes": {
- "origin": {
- "uri": "https://git.yoctoproject.org/yocto-docs"
- }
- },
+ "uri": "https://git.yoctoproject.org/yocto-docs",
"branch": "whinlatter",
"rev": "whinlatter"
}
--
2.51.0