Skip to contentSkip to conversation

branch parameter now mandatory in git SRC_URIs

PATCH New Michael Opdenacker 1 participant 3 messages Mar 10, 2022 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

v2 cover branch parameter now mandatory in git SRC_URIs

Changes since V1:
- Mesa now has a "main" branch
- Pick dummy or real examples with a "main" branch
- "branch=" is mandatory unless "nobranch=1"

Michael Opdenacker (2):
doc: bitbake-user-manual: add branch parameter to git SRC_URI examples
doc: bitbake-user-manual: branch parameter now mandatory in git
SRC_URIs

 .../bitbake-user-manual-fetching.rst               | 14 +++++++-------
 .../bitbake-user-manual-ref-variables.rst          |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
#2 lore raw

PATCH v2 1/2 doc: bitbake-user-manual: add branch parameter to git SRC_URI examples

This parameter is now required by the git fetcher module

---
 doc/bitbake-user-manual/bitbake-user-manual-fetching.rst  | 8 ++++----
 .../bitbake-user-manual-ref-variables.rst                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +4 -4
index 9ff4e161..07885392 100644
@@ -405,7 +405,7 @@ This fetcher supports the following parameters:
      ``[email protected]:mesa/mesa.git``, however the expected URL in
      :term:`SRC_URI` is the following::
 
-       SRC_URI = "git://[email protected]/mesa/mesa.git;protocol=ssh;..."
+       SRC_URI = "git://[email protected]/mesa/mesa.git;branch=main;protocol=ssh;..."
 
      Note the ``:`` character changed for a ``/`` before the path to the project.
 
@@ -457,9 +457,9 @@ This fetcher supports the following parameters:
 
 Here are some example URLs::
 
-   SRC_URI = "git://git.oe.handhelds.org/git/vip.git;tag=version-1"
-   SRC_URI = "git://git.oe.handhelds.org/git/vip.git;protocol=http"
-   SRC_URI = "git://[email protected]/mesa/mesa.git;protocol=ssh;..."
+   SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV};tag=${PV}"
+   SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main"
+   SRC_URI = "git://[email protected]/mesa/mesa.git;branch=main;protocol=ssh;..."
 
 .. note::
 
doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +2 -2
index 59a9de2f..9fc57d0a 100644
@@ -1413,8 +1413,8 @@ overview of their function and contents.
          :term:`SRC_URI` checksums or :term:`SRCREV` when you have more than one
          file or git repository specified in :term:`SRC_URI`. For example::
 
-            SRC_URI = "git://example.com/foo.git;name=first \
-                       git://example.com/bar.git;name=second \
+            SRC_URI = "git://example.com/foo.git;branch=main;name=first \
+                       git://example.com/bar.git;branch=main;name=second \
                        http://example.com/file.tar.gz;name=third"
 
             SRCREV_first = "f1d2d2f924e986ac86fdf7b36c94bcdf32beec15"
Signature · 1 line
2.25.1
#3 lore raw

PATCH v2 2/2 doc: bitbake-user-manual: branch parameter now mandatory in git SRC_URIs

In reply to Michael Opdenacker
---
 doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +3 -3
index 07885392..f9d9e617 100644
@@ -432,9 +432,9 @@ This fetcher supports the following parameters:
    raw Git metadata is provided. This parameter implies the "nocheckout"
    parameter as well.
 
--  *"branch":* The branch(es) of the Git tree to clone. If unset, this
-   is assumed to be "master". The number of branch parameters much match
-   the number of name parameters.
+-  *"branch":* The branch(es) of the Git tree to clone. Unless
+   "nobranch" is set to "1", this is a mandatory parameter. The number of
+   branch parameters must match the number of name parameters.
 
 -  *"rev":* The revision to use for the checkout. The default is
    "master".
Signature · 1 line
2.25.1