Skip to contentSkip to conversation

devtools: Initial recipe for repo 2.17.3

PATCH Superseded Jasper Orschulko 3 participants 5 messages Nov 5, 2021

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 devtools: Initial recipe for repo 2.17.3

From: Jasper Orschulko <[email protected]>

Add a recipe for repo, prerequisite for the repo fetcher.

---
 .../repo/files/0001-python3-shebang.patch     | 21 ++++++++++++
 .../0001-Set-REPO_REV-to-v2.17.3.patch        | 33 +++++++++++++++++++
 meta/recipes-devtools/repo/repo.inc           | 25 ++++++++++++++
 meta/recipes-devtools/repo/repo_2.17.3.bb     |  7 ++++
 4 files changed, 86 insertions(+)
 create mode 100644 meta/recipes-devtools/repo/files/0001-python3-shebang.patch
 create mode 100644 meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
 create mode 100644 meta/recipes-devtools/repo/repo.inc
 create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +21 -0
new file mode 100644
index 0000000000..09ccf58264
@@ -0,0 +1,21 @@
+From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
+From: Jasper Orschulko <[email protected]>
+Date: Tue, 14 Sep 2021 16:46:51 +0200
+Subject: [PATCH] python3 shebang
+
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index b13e34c..205e0e5 100755
+--- a/repo
++++ b/repo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding:utf-8 -*-
+ #
+ # Copyright (C) 2008 The Android Open Source Project
+--
+2.33.0
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch new file +33 -0
new file mode 100644
index 0000000000..4d76bfc5d2
@@ -0,0 +1,33 @@
+From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
+From: Jasper Orschulko <[email protected]>
+Date: Thu, 4 Nov 2021 16:55:12 +0100
+Subject: [PATCH] Set REPO_REV to v2.17.3
+
+repo is an unusual tool because it downloads all of its own Python modules
+using GPG-signed git tags, and stores those files as part of the project
+that it is working with.
+
+So in order to have a reproducible repo installation within the project
+folders, we hardcode the REPO_REV variable to this recipes PV.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <[email protected]>
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index 4cddbf1..cf5f6b1 100755
+--- a/repo
++++ b/repo
+@@ -142,7 +142,7 @@ if __name__ == '__main__':
+ REPO_URL = os.environ.get('REPO_URL', None)
+ if not REPO_URL:
+   REPO_URL = 'https://gerrit.googlesource.com/git-repo'
+-REPO_REV = os.environ.get('REPO_REV')
++REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
+ if not REPO_REV:
+   REPO_REV = 'stable'
+ # URL to file bug reports for repo tool issues.
+--
+2.33.1
meta/recipes-devtools/repo/repo.inc new file +25 -0
new file mode 100644
index 0000000000..60b32e4d74
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+SUMMARY = "Tool for managing many Git repositories"
+DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."
+HOMEPAGE = "https://android.googlesource.com/tools/repo"
+SECTION = "console/utils"
+
+LICENSE = "Apache-2.0"
+
+SRC_URI = "git://[email protected]/git-repo.git;protocol=https;branch=main"
+MIRRORS = "git://[email protected]/git-repo.git git://github.com/GerritCodeReview/git-repo.git \n"
+
+SRC_URI += "file://0001-python3-shebang.patch"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "python3"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${WORKDIR}/git/repo ${D}${bindir}
+}
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/repo/repo_2.17.3.bb new file +7 -0
new file mode 100644
index 0000000000..c26264b9e9
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+require recipes-devtools/repo/repo.inc
+
+SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
Signature · 1 line
2.33.1
#1 lore raw

PATCH v2 2/2 base.bbclass: Add sysroot deps for repo fetcher

From: Jasper Orschulko <[email protected]>

Add git-native and repo-native as prerequisite for the repo fetcher.

---
 meta/classes/base.bbclass | 5 +++++
 1 file changed, 5 insertions(+)
meta/classes/base.bbclass +5 -0
index a65fcc6c1d..3298bd1952 100644
@@ -665,6 +665,11 @@ python () {
         elif uri.scheme == "npm":
             d.appendVarFlag('do_fetch', 'depends', ' nodejs-native:do_populate_sysroot')
 
+        elif uri.scheme == "repo":
+            needsrcrev = True
+            d.appendVarFlag('do_fetch', 'depends', ' repo-native:do_populate_sysroot')
+            d.appendVarFlag('do_fetch', 'depends', ' git-native:do_populate_sysroot')
+
         # *.lz4 should DEPEND on lz4-native for unpacking
         if path.endswith('.lz4'):
             d.appendVarFlag('do_unpack', 'depends', ' lz4-native:do_populate_sysroot')
Signature · 1 line
2.33.1
#2 lore raw
In reply to Jasper Orschulko
Quoted 6 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Jasper Orschulko via lists.openembedded.org
Sent: den 5 november 2021 16:32
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; Jasper Orschulko <[email protected]>
Subject: [bitbake-devel] [oe-core][PATCH v2 1/2] devtools: Initial recipe for repo 2.17.3

Change the Git subject to:

repo: Add recipe for 2.17.3

Quoted 51 lines

From: Jasper Orschulko <[email protected]>

Add a recipe for repo, prerequisite for the repo fetcher.

---
 .../repo/files/0001-python3-shebang.patch     | 21 ++++++++++++
 .../0001-Set-REPO_REV-to-v2.17.3.patch        | 33 +++++++++++++++++++
 meta/recipes-devtools/repo/repo.inc           | 25 ++++++++++++++
 meta/recipes-devtools/repo/repo_2.17.3.bb     |  7 ++++
 4 files changed, 86 insertions(+)
 create mode 100644 meta/recipes-devtools/repo/files/0001-python3-shebang.patch
 create mode 100644 meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
 create mode 100644 meta/recipes-devtools/repo/repo.inc
 create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +21 -0
new file mode 100644
index 0000000000..09ccf58264
@@ -0,0 +1,21 @@
+From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
+From: Jasper Orschulko <[email protected]>
+Date: Tue, 14 Sep 2021 16:46:51 +0200
+Subject: [PATCH] python3 shebang
+
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index b13e34c..205e0e5 100755
+--- a/repo
++++ b/repo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding:utf-8 -*-
+ #
+ # Copyright (C) 2008 The Android Open Source Project
+--
+2.33.0
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch new file +1 -0
new file mode 100644
index 0000000000..4d76bfc5d2
@@ -0,0 +1,33 @@
+From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch line 11

Quoted 10 lines
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch new file +10 -0
+From: Jasper Orschulko <[email protected]>
+Date: Thu, 4 Nov 2021 16:55:12 +0100
+Subject: [PATCH] Set REPO_REV to v2.17.3
+
+repo is an unusual tool because it downloads all of its own Python modules
+using GPG-signed git tags, and stores those files as part of the project
+that it is working with.
+
+So in order to have a reproducible repo installation within the project
+folders, we hardcode the REPO_REV variable to this recipes PV.

Change "this recipes PV" to "a SHA1 that corresponds to the version of the recipe."

Quoted 29 lines
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch new file +22 -0
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <[email protected]>
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index 4cddbf1..cf5f6b1 100755
+--- a/repo
++++ b/repo
+@@ -142,7 +142,7 @@ if __name__ == '__main__':
+ REPO_URL = os.environ.get('REPO_URL', None)
+ if not REPO_URL:
+   REPO_URL = 'https://gerrit.googlesource.com/git-repo'
+-REPO_REV = os.environ.get('REPO_REV')
++REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
+ if not REPO_REV:
+   REPO_REV = 'stable'
+ # URL to file bug reports for repo tool issues.
+--
+2.33.1
meta/recipes-devtools/repo/repo.inc new file +1 -0
new file mode 100644
index 0000000000..60b32e4d74
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: MIT

meta/recipes-devtools/repo/repo.inc line 11

Quoted 10 lines
meta/recipes-devtools/repo/repo.inc new file +10 -0
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+SUMMARY = "Tool for managing many Git repositories"
+DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."
+HOMEPAGE = "https://android.googlesource.com/tools/repo"
+SECTION = "console/utils"
+
+LICENSE = "Apache-2.0"
+
+SRC_URI = "git://[email protected]/git-repo.git;protocol=https;branch=main"

I do not think you need to specify "git@" for this URL.

meta/recipes-devtools/repo/repo.inc line 12

Quoted 1 line
meta/recipes-devtools/repo/repo.inc new file +1 -0
+MIRRORS = "git://[email protected]/git-repo.git git://github.com/GerritCodeReview/git-repo.git \n"

It is probably better to use += and add to MIRRORS.

meta/recipes-devtools/repo/repo.inc line 14

Quoted 2 lines
meta/recipes-devtools/repo/repo.inc new file +2 -0
+
+SRC_URI += "file://0001-python3-shebang.patch"

I would rewrite the above lines as:

SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main" SRC_URI += "file://0001-python3-shebang.patch"

MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git \n"

meta/recipes-devtools/repo/repo.inc line 18

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "python3"

Change to RDEPENDS:${PN} and move it to between do_install() and BBCLASSEXTEND.

meta/recipes-devtools/repo/repo.inc line 22

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${WORKDIR}/git/repo ${D}${bindir}

Use tabs to indent shell code in OE-Core. You can also remove "-m 755" as that is the default for install.

meta/recipes-devtools/repo/repo_2.17.3.bb line 4

Quoted 13 lines
meta/recipes-devtools/repo/repo.inc new file +3 -0
+}
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/repo/repo_2.17.3.bb new file +4 -0
new file mode 100644
index 0000000000..c26264b9e9
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+require recipes-devtools/repo/repo.inc

Merge the repo.inc with the recipe as there is only one user of it.

Quoted 5 lines
meta/recipes-devtools/repo/repo_2.17.3.bb new file +3 -1
+
+SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
--

2.33.1

//Peter

#3 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi Peter,

Quoted 2 lines

Change to RDEPENDS:${PN} and move it to between do_install() and BBCLASSEXTEND.

What does this do? The Yocto manual only mentions RDEPENDS_${PN}.

ack to the rest.

- --
With best regards

Jasper Orschulko
DevOps Engineer

Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
[email protected]

• • • • • • • • • • • • • • • • • • • • • • • • • •

iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin

https://iris-sensing.com/

Quoted 190 lines · Peter Kjellerstedt
Quoted 11 lines

-----Original Message-----
From:
[email protected] <[email protected]

Quoted 1 line

On Behalf Of Jasper Orschulko via lists.openembedded.org

Sent: den 5 november 2021 16:32
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; Jasper Orschulko <[email protected]>
Subject: [bitbake-devel] [oe-core][PATCH v2 1/2] devtools: Initial recipe for repo 2.17.3

Change the Git subject to:

repo: Add recipe for 2.17.3

Quoted 72 lines

From: Jasper Orschulko <[email protected]>

Add a recipe for repo, prerequisite for the repo fetcher.

---
 .../repo/files/0001-python3-shebang.patch     | 21 ++++++++++++ .../0001-Set-REPO_REV-to-v2.17.3.patch        | 33
+++++++++++++++++++
 meta/recipes-devtools/repo/repo.inc           | 25 ++++++++++++++ meta/recipes-devtools/repo/repo_2.17.3.bb     |  7 ++++

 4 files changed, 86 insertions(+)

 create mode 100644 meta/recipes-devtools/repo/files/0001-python3- shebang.patch
 create mode 100644 meta/recipes-devtools/repo/repo-2.17.3/0001-Set- REPO_REV-to-v2.17.3.patch
 create mode 100644 meta/recipes-devtools/repo/repo.inc create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb

(quoted diff) +0 -0

shebang.patch > b/meta/recipes-devtools/repo/files/0001-python3- shebang.patch
new file mode 100644
index 0000000000..09ccf58264

meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +1 -0
@@ -0,0 +1,21 @@
+From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +20 -0
+From: Jasper Orschulko <[email protected]>
+Date: Tue, 14 Sep 2021 16:46:51 +0200
+Subject: [PATCH] python3 shebang
+
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index b13e34c..205e0e5 100755
+--- a/repo
++++ b/repo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding:utf-8 -*-
+ #
+ # Copyright (C) 2008 The Android Open Source Project
+--
+2.33.0
(quoted diff) +0 -0

REPO_REV-to-v2.17.3.patch b/meta/recipes-devtools/repo/repo- 2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
new file mode 100644
index 0000000000..4d76bfc5d2

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +0 -0

v2.17.3.patch

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +1 -0
@@ -0,0 +1,33 @@
+From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00

2001

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +5 -0
+From: Jasper Orschulko <[email protected]>
+Date: Thu, 4 Nov 2021 16:55:12 +0100
+Subject: [PATCH] Set REPO_REV to v2.17.3
+
+repo is an unusual tool because it downloads all of its own Python

modules
+using GPG-signed git tags, and stores those files as part of the project

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +3 -0
+that it is working with.
+
+So in order to have a reproducible repo installation within the
Quoted 2 lines

project
+folders, we hardcode the REPO_REV variable to this recipes PV.

Change "this recipes PV" to "a SHA1 that corresponds to the version of the recipe."

Quoted 42 lines
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +22 -0
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <[email protected]>
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index 4cddbf1..cf5f6b1 100755
+--- a/repo
++++ b/repo
+@@ -142,7 +142,7 @@ if __name__ == '__main__':
+ REPO_URL = os.environ.get('REPO_URL', None)
+ if not REPO_URL:
+   REPO_URL = 'https://gerrit.googlesource.com/git-repo'
+-REPO_REV = os.environ.get('REPO_REV')
++REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
+ if not REPO_REV:
+   REPO_REV = 'stable'
+ # URL to file bug reports for repo tool issues.
+--
+2.33.1
meta/recipes- renamed from meta/recipes-devtools/repo/repo.inc +0 -0

devtools/repo/repo.inc
new file mode 100644
index 0000000000..60b32e4d74

meta/recipes-devtools/repo/repo.inc new file +5 -0
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+SUMMARY = "Tool for managing many Git repositories"
+DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage

many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."

meta/recipes-devtools/repo/repo.inc new file +6 -0
+HOMEPAGE = "https://android.googlesource.com/tools/repo"
+SECTION = "console/utils"
+
+LICENSE = "Apache-2.0"
+
+SRC_URI = "git://[email protected]/git-
Quoted 1 line

repo.git;protocol=https;branch=main"

I do not think you need to specify "git@" for this URL.

Quoted 2 lines

+MIRRORS = "git://[email protected]/git-repo.git
git://github.com/GerritCodeReview/git-repo.git \n"

It is probably better to use += and add to MIRRORS.

meta/recipes-devtools/repo/repo.inc

Quoted 2 lines
meta/recipes-devtools/repo/repo.inc new file +2 -0
+
+SRC_URI += "file://0001-python3-shebang.patch"

I would rewrite the above lines as:

SRC_URI = "git://gerrit.googlesource.com/git-
repo.git;protocol=https;branch=main"
SRC_URI += "file://0001-python3-shebang.patch"

MIRRORS += "git://gerrit.googlesource.com/git-repo.git
git://github.com/GerritCodeReview/git-repo.git \n"

meta/recipes-devtools/repo/repo.inc line 18

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "python3"

Change to RDEPENDS:${PN} and move it to between do_install() and BBCLASSEXTEND.

meta/recipes-devtools/repo/repo.inc line 22

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${WORKDIR}/git/repo ${D}${bindir}

Use tabs to indent shell code in OE-Core. You can also remove "-m 755" as that is the default for install.

Quoted 10 lines
meta/recipes-devtools/repo/repo.inc new file +3 -0
+}
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/repo/repo_2.17.3.bb new file +0 -0
new file mode 100644
index 0000000000..c26264b9e9

meta/recipes-devtools/repo/repo_2.17.3.bb line 4

Quoted 4 lines
meta/recipes-devtools/repo/repo_2.17.3.bb new file +4 -0
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+require recipes-devtools/repo/repo.inc

Merge the repo.inc with the recipe as there is only one user of it.

Quoted 9 lines
Quoted 6 lines
meta/recipes-devtools/repo/repo_2.17.3.bb new file +3 -0
+
+SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
+LIC_FILES_CHKSUM =

"file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" --
2.33.1

//Peter

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGFXJAACgkQYgqew07V MNVx1wf+J5fXl6SlC2C4N6F48fnxW0bK4v+xaKeUjlQJ6oN2i6SDAgHKix54SOhz z8RbepU3GHikSk2/GXn/cX6gNzG8sxBfAbhT0MeTjiJEfbhuyqYWo3W+i5t8NPuL 76Gm5ya4ljnATItAhIgBC1WyGgqbpMCajB82gLw1XEC6mlD4fUoma2SBIWfGh94y jbU6ixUKF0ulmSyK2q20yzXjq6jd++ShDaYeSPx5P1s0C1NeWoTM8llaaagnJ3R1 Cnj/uFVff7a46i4yd4pbK6o4oj8sNoBcBpRkX9szHBF4xALF9v6sAAD4qkYtGwq0 CwN3psutY1op4hHS4OFCJg8Vl8AHpw==
=bwdZ
-----END PGP SIGNATURE-----

#4 lore raw
Quoted 13 lines

-----Original Message-----
From: Jasper Orschulko <[email protected]>
Sent: den 5 november 2021 17:32
To: [email protected]; Peter Kjellerstedt <[email protected]>; [email protected]
Cc: [email protected]; Daniel Baumgart <[email protected]>; [email protected]
Subject: Re: [bitbake-devel] [oe-core][PATCH v2 1/2] devtools: Initial recipe for repo 2.17.3

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Quoted 6 lines

Hi Peter,

Quoted 2 lines

Change to RDEPENDS:${PN} and move it to between do_install() and BBCLASSEXTEND.

What does this do? The Yocto manual only mentions RDEPENDS_${PN}.

The syntax for bitbake variable overrides were changed with the Honister release, see:

https://docs.yoctoproject.org/3.4/migration-guides/migration-3.4.html#override-syntax-changes

//Peter

Quoted 237 lines

ack to the rest.

- --
With best regards

Jasper Orschulko
DevOps Engineer

Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
[email protected]

• • • • • • • • • • • • • • • • • • • • • • • • • •

iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin

https://iris-sensing.com/

Quoted 3 lines · Peter Kjellerstedt
Quoted 3 lines

-----Original Message-----
From:
[email protected] <bitbake-

[email protected]

Quoted 187 lines
Quoted 8 lines
Quoted 1 line

On Behalf Of Jasper Orschulko via lists.openembedded.org

Sent: den 5 november 2021 16:32
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; Jasper Orschulko <[email protected]>
Subject: [bitbake-devel] [oe-core][PATCH v2 1/2] devtools: Initial recipe for repo 2.17.3

Change the Git subject to:

repo: Add recipe for 2.17.3

Quoted 72 lines

From: Jasper Orschulko <[email protected]>

Add a recipe for repo, prerequisite for the repo fetcher.

---
 .../repo/files/0001-python3-shebang.patch     | 21 ++++++++++++ .../0001-Set-REPO_REV-to-v2.17.3.patch        | 33
+++++++++++++++++++
 meta/recipes-devtools/repo/repo.inc           | 25 ++++++++++++++ meta/recipes-devtools/repo/repo_2.17.3.bb     |  7 ++++

 4 files changed, 86 insertions(+)

 create mode 100644 meta/recipes-devtools/repo/files/0001-python3- shebang.patch
 create mode 100644 meta/recipes-devtools/repo/repo-2.17.3/0001-Set- REPO_REV-to-v2.17.3.patch
 create mode 100644 meta/recipes-devtools/repo/repo.inc create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb

(quoted diff) +0 -0

shebang.patch > b/meta/recipes-devtools/repo/files/0001-python3- shebang.patch
new file mode 100644
index 0000000000..09ccf58264

meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +1 -0
@@ -0,0 +1,21 @@
+From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/repo/files/0001-python3-shebang.patch new file +20 -0
+From: Jasper Orschulko <[email protected]>
+Date: Tue, 14 Sep 2021 16:46:51 +0200
+Subject: [PATCH] python3 shebang
+
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index b13e34c..205e0e5 100755
+--- a/repo
++++ b/repo
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding:utf-8 -*-
+ #
+ # Copyright (C) 2008 The Android Open Source Project
+--
+2.33.0
(quoted diff) +0 -0

REPO_REV-to-v2.17.3.patch b/meta/recipes-devtools/repo/repo- 2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
new file mode 100644
index 0000000000..4d76bfc5d2

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +0 -0

v2.17.3.patch

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +1 -0
@@ -0,0 +1,33 @@
+From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00

2001

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +5 -0
+From: Jasper Orschulko <[email protected]>
+Date: Thu, 4 Nov 2021 16:55:12 +0100
+Subject: [PATCH] Set REPO_REV to v2.17.3
+
+repo is an unusual tool because it downloads all of its own Python

modules
+using GPG-signed git tags, and stores those files as part of the project

meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +3 -0
+that it is working with.
+
+So in order to have a reproducible repo installation within the
Quoted 2 lines

project
+folders, we hardcode the REPO_REV variable to this recipes PV.

Change "this recipes PV" to "a SHA1 that corresponds to the version of the recipe."

Quoted 42 lines
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to- new file +22 -0
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <[email protected]>
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index 4cddbf1..cf5f6b1 100755
+--- a/repo
++++ b/repo
+@@ -142,7 +142,7 @@ if __name__ == '__main__':
+ REPO_URL = os.environ.get('REPO_URL', None)
+ if not REPO_URL:
+   REPO_URL = 'https://gerrit.googlesource.com/git-repo'
+-REPO_REV = os.environ.get('REPO_REV')
++REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
+ if not REPO_REV:
+   REPO_REV = 'stable'
+ # URL to file bug reports for repo tool issues.
+--
+2.33.1
meta/recipes- renamed from meta/recipes-devtools/repo/repo.inc +0 -0

devtools/repo/repo.inc
new file mode 100644
index 0000000000..60b32e4d74

meta/recipes-devtools/repo/repo.inc new file +5 -0
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+SUMMARY = "Tool for managing many Git repositories"
+DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage

many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."

meta/recipes-devtools/repo/repo.inc new file +6 -0
+HOMEPAGE = "https://android.googlesource.com/tools/repo"
+SECTION = "console/utils"
+
+LICENSE = "Apache-2.0"
+
+SRC_URI = "git://[email protected]/git-
Quoted 1 line

repo.git;protocol=https;branch=main"

I do not think you need to specify "git@" for this URL.

Quoted 2 lines

+MIRRORS = "git://[email protected]/git-repo.git
git://github.com/GerritCodeReview/git-repo.git \n"

It is probably better to use += and add to MIRRORS.

meta/recipes-devtools/repo/repo.inc

Quoted 2 lines
meta/recipes-devtools/repo/repo.inc new file +2 -0
+
+SRC_URI += "file://0001-python3-shebang.patch"

I would rewrite the above lines as:

SRC_URI = "git://gerrit.googlesource.com/git-
repo.git;protocol=https;branch=main"
SRC_URI += "file://0001-python3-shebang.patch"

MIRRORS += "git://gerrit.googlesource.com/git-repo.git
git://github.com/GerritCodeReview/git-repo.git \n"

meta/recipes-devtools/repo/repo.inc line 18

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} = "python3"

Change to RDEPENDS:${PN} and move it to between do_install() and BBCLASSEXTEND.

meta/recipes-devtools/repo/repo.inc line 22

Quoted 4 lines
meta/recipes-devtools/repo/repo.inc new file +4 -0
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${WORKDIR}/git/repo ${D}${bindir}

Use tabs to indent shell code in OE-Core. You can also remove "-m 755" as that is the default for install.

Quoted 10 lines
meta/recipes-devtools/repo/repo.inc new file +3 -0
+}
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/repo/repo_2.17.3.bb new file +0 -0
new file mode 100644
index 0000000000..c26264b9e9

meta/recipes-devtools/repo/repo_2.17.3.bb line 4

Quoted 4 lines
meta/recipes-devtools/repo/repo_2.17.3.bb new file +4 -0
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+require recipes-devtools/repo/repo.inc

Merge the repo.inc with the recipe as there is only one user of it.

Quoted 9 lines
Quoted 6 lines
meta/recipes-devtools/repo/repo_2.17.3.bb new file +3 -0
+
+SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
+LIC_FILES_CHKSUM =

"file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" --
2.33.1

//Peter

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGFXJAACgkQYgqew07V MNVx1wf+J5fXl6SlC2C4N6F48fnxW0bK4v+xaKeUjlQJ6oN2i6SDAgHKix54SOhz z8RbepU3GHikSk2/GXn/cX6gNzG8sxBfAbhT0MeTjiJEfbhuyqYWo3W+i5t8NPuL 76Gm5ya4ljnATItAhIgBC1WyGgqbpMCajB82gLw1XEC6mlD4fUoma2SBIWfGh94y jbU6ixUKF0ulmSyK2q20yzXjq6jd++ShDaYeSPx5P1s0C1NeWoTM8llaaagnJ3R1 Cnj/uFVff7a46i4yd4pbK6o4oj8sNoBcBpRkX9szHBF4xALF9v6sAAD4qkYtGwq0 CwN3psutY1op4hHS4OFCJg8Vl8AHpw==
=bwdZ
-----END PGP SIGNATURE-----