diff mbox series

bitbake-setup: correct the confusion over 'uri' format in json configs

Message ID 20251123103613.2701128-1-alex.kanavin@gmail.com
State New
Headers show
Series bitbake-setup: correct the confusion over 'uri' format in json configs | expand

Commit Message

Alexander Kanavin Nov. 23, 2025, 10:36 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

The 'uri' property in bitbake-setup json configurations is actually
using the standard git URI syntax, and not bitbake fetcher-specific one.
Bitbake-setup converts it to something the git fetcher understands.

This was overlooked when default registry configs were added. It worked
but only by coincidence (and was using git:// protocol despite 'protocol=https'
in the value).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 default-registry/configurations/oe-nodistro.conf.json    | 6 +++---
 default-registry/configurations/poky-master.conf.json    | 8 ++++----
 .../bitbake-user-manual-environment-setup.rst            | 9 ++++-----
 setup-schema/layers.schema.json                          | 2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/default-registry/configurations/oe-nodistro.conf.json b/default-registry/configurations/oe-nodistro.conf.json
index 70ae6d364..9f9314399 100644
--- a/default-registry/configurations/oe-nodistro.conf.json
+++ b/default-registry/configurations/oe-nodistro.conf.json
@@ -5,7 +5,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.openembedded.org/bitbake;protocol=https"
+                        "uri": "https://git.openembedded.org/bitbake"
                     }
                 },
                 "branch": "master",
@@ -16,7 +16,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.openembedded.org/openembedded-core;protocol=https"
+                        "uri": "https://git.openembedded.org/openembedded-core"
                     }
                 },
                 "branch": "master",
@@ -27,7 +27,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.yoctoproject.org/yocto-docs;protocol=https"
+                        "uri": "https://git.yoctoproject.org/yocto-docs"
                     }
                 },
                 "branch": "master",
diff --git a/default-registry/configurations/poky-master.conf.json b/default-registry/configurations/poky-master.conf.json
index 6940129a6..1de038bab 100644
--- a/default-registry/configurations/poky-master.conf.json
+++ b/default-registry/configurations/poky-master.conf.json
@@ -5,7 +5,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.openembedded.org/bitbake;protocol=https"
+                        "uri": "https://git.openembedded.org/bitbake"
                     }
                 },
                 "branch": "master",
@@ -16,7 +16,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.openembedded.org/openembedded-core;protocol=https"
+                        "uri": "https://git.openembedded.org/openembedded-core"
                     }
                 },
                 "branch": "master",
@@ -27,7 +27,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.yoctoproject.org/meta-yocto;protocol=https"
+                        "uri": "https://git.yoctoproject.org/meta-yocto"
                     }
                 },
                 "branch": "master",
@@ -38,7 +38,7 @@ 
             "git-remote": {
                 "remotes": {
                     "origin": {
-                        "uri": "git://git.yoctoproject.org/yocto-docs;protocol=https"
+                        "uri": "https://git.yoctoproject.org/yocto-docs"
                     }
                 },
                 "branch": "master",
diff --git a/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst b/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst
index 8a90e33e8..2b8051bcb 100644
--- a/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst
+++ b/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst
@@ -662,7 +662,7 @@  They contain the following sections:
                  "git-remote": {
                      "remotes": {
                          "origin": {
-                             "uri": "git://git.openembedded.org/bitbake;protocol=https"
+                             "uri": "https://git.openembedded.org/bitbake"
                          }
                      },
                      "branch": "master",
@@ -675,9 +675,8 @@  They contain the following sections:
 
    Sources can be specified with the following options:
 
-   -  ``uri`` (**required**): a URI that follows the BitBake Git fetcher syntax.
-      See the :doc:`/bitbake-user-manual/bitbake-user-manual-fetching` section
-      for more information on the Git fetcher.
+   -  ``uri`` (**required**): a URI that follows the git URI syntax.
+      See https://git-scm.com/docs/git-clone#_git_urls for more information.
 
    -  ``rev`` (**required**): the revision to checkout. Can be the name of the
       branch to checkout on the latest revision of the specified ``branch``.
@@ -879,7 +878,7 @@  Here is an example file that overrides the branch of the BitBake repository to
                    "branch": "master-next",
                    "remotes": {
                        "origin": {
-                           "uri": "git://git.openembedded.org/bitbake;protocol=https"
+                           "uri": "https://git.openembedded.org/bitbake"
                        }
                    },
                    "rev": "master-next"
diff --git a/setup-schema/layers.schema.json b/setup-schema/layers.schema.json
index b5c13fdb5..144ea6d9f 100644
--- a/setup-schema/layers.schema.json
+++ b/setup-schema/layers.schema.json
@@ -58,7 +58,7 @@ 
                                             ],
                                             "properties": {
                                                 "uri": {
-                                                    "description": "The URI for the remote",
+                                                    "description": "The URI for the remote, using git URL syntax",
                                                     "type": "string"
                                                 }
                                             }