* [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
@ 2021-11-11 10:21 jasper
2021-11-11 10:21 ` [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: jasper @ 2021-11-11 10:21 UTC (permalink / raw)
To: openembedded-core
Cc: martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
---
meta/conf/distro/include/maintainers.inc | 1 +
.../0001-Set-REPO_REV-to-v2.17.3.patch | 35 +++++++++++++++++++
.../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
4 files changed, 90 insertions(+)
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/0001-python3-shebang.patch
create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index f3e0a75d56..58a0a9615f 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>"
+RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>"
RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>"
RECIPE_MAINTAINER:pn-rgb = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>"
diff --git a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-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..285b1d3129
--- /dev/null
+++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
@@ -0,0 +1,35 @@
+From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
+From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
+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 default REPO_REV to a SHA1 that corresponds to
+the version of the recipe. REPO_REV can still be overwriten by the user,
+by specifying the REPO_REV environment variable.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
+---
+ repo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/repo b/repo
+index b13e34c..31130e9 100755
+--- a/repo
++++ b/repo
+@@ -130,7 +130,7 @@ if not REPO_URL:
+ REPO_URL = 'https://gerrit.googlesource.com/git-repo'
+ REPO_REV = os.environ.get('REPO_REV')
+ if not REPO_REV:
+- REPO_REV = 'stable'
++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
+
+ # increment this whenever we make important changes to this script
+ VERSION = (2, 8)
+--
+2.33.1
diff --git a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
new file mode 100644
index 0000000000..d3888c8bb2
--- /dev/null
+++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
@@ -0,0 +1,26 @@
+From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
+From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
+Date: Tue, 14 Sep 2021 16:46:51 +0200
+Subject: [PATCH] python3 shebang
+
+Yocto does not symlink from python to python3, thus change the shebang from
+python to python3.
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
+---
+ 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
diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb b/meta/recipes-devtools/repo/repo_2.17.3.bb
new file mode 100644
index 0000000000..cb0af89c09
--- /dev/null
+++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
@@ -0,0 +1,28 @@
+# 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"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main"
+SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
+
+SRC_URI += "file://0001-python3-shebang.patch \
+ file://0001-Set-REPO_REV-to-v2.17.3.patch"
+
+MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git \n"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+ install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
+}
+
+RDEPENDS:${PN} = "python3"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.33.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher
2021-11-11 10:21 [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 jasper
@ 2021-11-11 10:21 ` jasper
2021-11-11 10:59 ` [bitbake-devel] " Jose Quaresma
2021-11-11 11:00 ` [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 Jose Quaresma
2021-11-11 11:20 ` Peter Kjellerstedt
2 siblings, 1 reply; 8+ messages in thread
From: jasper @ 2021-11-11 10:21 UTC (permalink / raw)
To: openembedded-core
Cc: martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
Add git-native and repo-native as prerequisite for the repo fetcher.
Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
---
meta/classes/base.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a65fcc6c1d..3298bd1952 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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')
--
2.33.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [bitbake-devel] [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher
2021-11-11 10:21 ` [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
@ 2021-11-11 10:59 ` Jose Quaresma
0 siblings, 0 replies; 8+ messages in thread
From: Jose Quaresma @ 2021-11-11 10:59 UTC (permalink / raw)
To: jasper; +Cc: OE-core, martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
[-- Attachment #1: Type: text/plain, Size: 1834 bytes --]
Jasper Orschulko via lists.openembedded.org <jasper=
fancydomain.eu@lists.openembedded.org> escreveu no dia quinta, 11/11/2021
à(s) 10:22:
> From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
>
> Add git-native and repo-native as prerequisite for the repo fetcher.
>
> Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> ---
> meta/classes/base.bbclass | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index a65fcc6c1d..3298bd1952 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -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')
>
Please remove git and add it as a runtime dependency of the repo.
Jose
+
> # *.lz4 should DEPEND on lz4-native for unpacking
> if path.endswith('.lz4'):
> d.appendVarFlag('do_unpack', 'depends', '
> lz4-native:do_populate_sysroot')
> --
> 2.33.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#13004):
> https://lists.openembedded.org/g/bitbake-devel/message/13004
> Mute This Topic: https://lists.openembedded.org/mt/86978424/5052612
> Group Owner: bitbake-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
Best regards,
José Quaresma
[-- Attachment #2: Type: text/html, Size: 3342 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
2021-11-11 10:21 [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 jasper
2021-11-11 10:21 ` [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
@ 2021-11-11 11:00 ` Jose Quaresma
2021-11-11 12:29 ` Jasper Orschulko
2021-12-06 15:57 ` Jasper Orschulko
2021-11-11 11:20 ` Peter Kjellerstedt
2 siblings, 2 replies; 8+ messages in thread
From: Jose Quaresma @ 2021-11-11 11:00 UTC (permalink / raw)
To: jasper; +Cc: OE-core, martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
[-- Attachment #1: Type: text/plain, Size: 6914 bytes --]
Jasper Orschulko via lists.openembedded.org <jasper=
fancydomain.eu@lists.openembedded.org> escreveu no dia quinta, 11/11/2021
à(s) 10:21:
> From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
>
> Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
>
> Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> ---
> meta/conf/distro/include/maintainers.inc | 1 +
> .../0001-Set-REPO_REV-to-v2.17.3.patch | 35 +++++++++++++++++++
> .../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
> meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
> 4 files changed, 90 insertions(+)
> 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/0001-python3-shebang.patch
> create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index f3e0a75d56..58a0a9615f 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang <
> liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
> RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
> RECIPE_MAINTAINER:pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>"
> +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko <
> Jasper.Orschulko@iris-sensing.com>"
> RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>"
> RECIPE_MAINTAINER:pn-rgb = "Unassigned <unassigned@yoctoproject.org>"
> RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>"
> diff --git
> a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-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..285b1d3129
> --- /dev/null
> +++
> b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch
> @@ -0,0 +1,35 @@
> +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +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 default REPO_REV to a SHA1 that corresponds to
> +the version of the recipe. REPO_REV can still be overwriten by the user,
> +by specifying the REPO_REV environment variable.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +---
> + repo | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/repo b/repo
> +index b13e34c..31130e9 100755
> +--- a/repo
> ++++ b/repo
> +@@ -130,7 +130,7 @@ if not REPO_URL:
> + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> + REPO_REV = os.environ.get('REPO_REV')
> + if not REPO_REV:
> +- REPO_REV = 'stable'
> ++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
> +
> + # increment this whenever we make important changes to this script
> + VERSION = (2, 8)
> +--
> +2.33.1
> diff --git a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> new file mode 100644
> index 0000000000..d3888c8bb2
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> @@ -0,0 +1,26 @@
> +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +Date: Tue, 14 Sep 2021 16:46:51 +0200
> +Subject: [PATCH] python3 shebang
> +
> +Yocto does not symlink from python to python3, thus change the shebang
> from
> +python to python3.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +---
> + 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
> diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb
> b/meta/recipes-devtools/repo/repo_2.17.3.bb
> new file mode 100644
> index 0000000000..cb0af89c09
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> @@ -0,0 +1,28 @@
> +# 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"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> +
> +SRC_URI = "git://
> gerrit.googlesource.com/git-repo.git;protocol=https;branch=main"
> +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> +
> +SRC_URI += "file://0001-python3-shebang.patch \
> + file://0001-Set-REPO_REV-to-v2.17.3.patch"
>
I think we can replace the patch 0001-Set-REPO_REV-to-v2.17.3.patch with a
post function
and with it we can reuse the SRCREV of the recipe. Something like:
do_fix_rev(){
sed -i "s/REPO_REV = 'stable'/REPO_REV = '${SRCREV}'" ${S}/repo
}
do_patch[postfuncs] += "do_fix_rev"
> +
> +MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://
> github.com/GerritCodeReview/git-repo.git \n"
> +
> +S = "${WORKDIR}/git"
> +
> +do_install() {
> + install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
> +}
> +
> +RDEPENDS:${PN} = "python3"
>
repo uses git internally, so add it
RDEPENDS:${PN} = "python3 git"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.33.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#13003):
> https://lists.openembedded.org/g/bitbake-devel/message/13003
> Mute This Topic: https://lists.openembedded.org/mt/86978419/5052612
> Group Owner: bitbake-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
Best regards,
José Quaresma
[-- Attachment #2: Type: text/html, Size: 10668 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
2021-11-11 10:21 [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 jasper
2021-11-11 10:21 ` [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
2021-11-11 11:00 ` [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 Jose Quaresma
@ 2021-11-11 11:20 ` Peter Kjellerstedt
2021-11-11 12:32 ` Jasper Orschulko
2 siblings, 1 reply; 8+ messages in thread
From: Peter Kjellerstedt @ 2021-11-11 11:20 UTC (permalink / raw)
To: jasper, openembedded-core
Cc: martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Jasper Orschulko via lists.openembedded.org
> Sent: den 11 november 2021 11:21
> To: openembedded-core@lists.openembedded.org
> Cc: martin@mko.dev; Daniel.Baumgart@iris-sensing.com; bitbake-devel@lists.openembedded.org; Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> Subject: [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
>
> From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
>
> Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
>
> Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> ---
> meta/conf/distro/include/maintainers.inc | 1 +
> .../0001-Set-REPO_REV-to-v2.17.3.patch | 35 +++++++++++++++++++
> .../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
> meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
> 4 files changed, 90 insertions(+)
> 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/0001-python3-shebang.patch
> create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index f3e0a75d56..58a0a9615f 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang <liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
> RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
> RECIPE_MAINTAINER:pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>"
> +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>"
> RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>"
> RECIPE_MAINTAINER:pn-rgb = "Unassigned <unassigned@yoctoproject.org>"
> RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>"
> diff --git a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-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..285b1d3129
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> v2.17.3.patch
> @@ -0,0 +1,35 @@
> +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +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 default REPO_REV to a SHA1 that corresponds to
> +the version of the recipe. REPO_REV can still be overwriten by the user,
> +by specifying the REPO_REV environment variable.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +---
> + repo | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/repo b/repo
> +index b13e34c..31130e9 100755
> +--- a/repo
> ++++ b/repo
> +@@ -130,7 +130,7 @@ if not REPO_URL:
> + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> + REPO_REV = os.environ.get('REPO_REV')
> + if not REPO_REV:
> +- REPO_REV = 'stable'
> ++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
> +
> + # increment this whenever we make important changes to this script
> + VERSION = (2, 8)
> +--
> +2.33.1
> diff --git a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> new file mode 100644
> index 0000000000..d3888c8bb2
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> @@ -0,0 +1,26 @@
> +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
> +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +Date: Tue, 14 Sep 2021 16:46:51 +0200
> +Subject: [PATCH] python3 shebang
> +
> +Yocto does not symlink from python to python3, thus change the shebang from
> +python to python3.
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> +---
> + 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
> diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb b/meta/recipes-devtools/repo/repo_2.17.3.bb
> new file mode 100644
> index 0000000000..cb0af89c09
> --- /dev/null
> +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> @@ -0,0 +1,28 @@
> +# 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"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> +
> +SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main"
> +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> +
> +SRC_URI += "file://0001-python3-shebang.patch \
> + file://0001-Set-REPO_REV-to-v2.17.3.patch"
> +
> +MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git \n"
Remove " \n".
> +
> +S = "${WORKDIR}/git"
> +
> +do_install() {
> + install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
You can remove "m 0755" as that is the default for install.
> +}
> +
> +RDEPENDS:${PN} = "python3"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.33.1
//Peter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
2021-11-11 11:00 ` [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 Jose Quaresma
@ 2021-11-11 12:29 ` Jasper Orschulko
2021-12-06 15:57 ` Jasper Orschulko
1 sibling, 0 replies; 8+ messages in thread
From: Jasper Orschulko @ 2021-11-11 12:29 UTC (permalink / raw)
To: richard.purdie, quaresma.jose, jasper
Cc: openembedded-core, martin, Daniel Baumgart, bitbake-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi Jose,
> I think we can replace the patch 0001-Set-REPO_REV-to-v2.17.3.patch
> with a post function
> and with it we can reuse the SRCREV of the recipe. Something like:
>
> do_fix_rev(){
> sed -i "s/REPO_REV = 'stable'/REPO_REV = '${SRCREV}'" ${S}/repo
> }
>
> do_patch[postfuncs] += "do_fix_rev"
Yeah... was thinking about that as well. Wasn't sure though if this
would be considered bad practise. What do the others think about this?
@Richard?
> repo uses git internally, so add it
>
> RDEPENDS:${PN} = "python3 git"
will be fixed in v6.
- --
With best regards
Jasper Orschulko
DevOps Engineer
Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
Jasper.Orschulko@iris-sensing.com
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
https://iris-sensing.com/
On Thu, 2021-11-11 at 11:00 +0000, Jose Quaresma wrote:
>
> Jasper Orschulko via lists.openembedded.org
> <jasper=fancydomain.eu@lists.openembedded.org> escreveu no dia
> quinta, 11/11/2021 à(s) 10:21:
> > From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> >
> > Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
> >
> > Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 +
> > .../0001-Set-REPO_REV-to-v2.17.3.patch | 35
> > +++++++++++++++++++
> > .../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
> > meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
> > 4 files changed, 90 insertions(+)
> > 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/0001-python3-
> > shebang.patch
> > create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> > b/meta/conf/distro/include/maintainers.inc
> > index f3e0a75d56..58a0a9615f 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert
> > Yang
> > <liezhi.yang@windriver.com>"
> > RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
> > RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
> > RECIPE_MAINTAINER:pn-readline = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>"
> > RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi
> > <Qi.Chen@windriver.com>"
> > RECIPE_MAINTAINER:pn-rgb = "Unassigned
> > <unassigned@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > diff --git a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-
> > 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..285b1d3129
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> > v2.17.3.patch
> > @@ -0,0 +1,35 @@
> > +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +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 default REPO_REV to a SHA1 that
> > corresponds
> > to
> > +the version of the recipe. REPO_REV can still be overwriten by the
> > user,
> > +by specifying the REPO_REV environment variable.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + repo | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/repo b/repo
> > +index b13e34c..31130e9 100755
> > +--- a/repo
> > ++++ b/repo
> > +@@ -130,7 +130,7 @@ if not REPO_URL:
> > + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> > + REPO_REV = os.environ.get('REPO_REV')
> > + if not REPO_REV:
> > +- REPO_REV = 'stable'
> > ++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
> > +
> > + # increment this whenever we make important changes to this
> > script
> > + VERSION = (2, 8)
> > +--
> > +2.33.1
> > diff --git a/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch
> > new file mode 100644
> > index 0000000000..d3888c8bb2
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> > @@ -0,0 +1,26 @@
> > +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +Date: Tue, 14 Sep 2021 16:46:51 +0200
> > +Subject: [PATCH] python3 shebang
> > +
> > +Yocto does not symlink from python to python3, thus change the
> > shebang from
> > +python to python3.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + 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
> > diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb
> > b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > new file mode 100644
> > index 0000000000..cb0af89c09
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > @@ -0,0 +1,28 @@
> > +# 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"
> > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> > +
> > +SRC_URI =
> > "git://gerrit.googlesource.com/git-
> > repo.git;protocol=https;branch=main
> > "
> > +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> > +
> > +SRC_URI += "file://0001-python3-shebang.patch \
> > + file://0001-Set-REPO_REV-to-v2.17.3.patch"
> >
>
>
> I think we can replace the patch 0001-Set-REPO_REV-to-v2.17.3.patch
> with a post function
> and with it we can reuse the SRCREV of the recipe. Something like:
>
> do_fix_rev(){
> sed -i "s/REPO_REV = 'stable'/REPO_REV = '${SRCREV}'" ${S}/repo
> }
>
> do_patch[postfuncs] += "do_fix_rev"
>
> > +
> > +MIRRORS += "git://gerrit.googlesource.com/git-repo.git
> > git://github.com/GerritCodeReview/git-repo.git \n"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +do_install() {
> > + install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
> > +}
> > +
> > +RDEPENDS:${PN} = "python3"
> >
>
>
> repo uses git internally, so add it
>
> RDEPENDS:${PN} = "python3 git"
>
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.33.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#13003):
> > https://lists.openembedded.org/g/bitbake-devel/message/13003
> > Mute This Topic: https://lists.openembedded.org/mt/86978419/5052612
> > Group Owner: bitbake-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub
> > [quaresma.jose@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGNDK4ACgkQYgqew07V
MNVSyAgAm4kKGEsbY3sCNCj1ts9ZMsv2pUAhRb7yKpEotuWpz/z1GvlGwHQw5TXH
cROgXpHMy3p+UVSX1VGxyrTfvGM3bW0UFbravBvguSU4zXspIJ6UU8bPQ3/+wghf
M0tudQxwB60EAeWQoKZYPrjYxHXnZPgbxUmf75kJ1Wg18jEPbkbyLbOgu/vkGn3l
qujaWB9fLxAO7FYKlUcZ5cpNQmsaO6COv6S6BFv7bdqf2MKjYb4XL39RmJcbSKIl
gXoOGye9DPskvcpgo+E6KTTew45iA7rP2huFZmuHXUgsjW4qbU0LQnbVIv76U1cU
VJSDnsK6PYBpax7c/uR1l6AVp8EvAQ==
=z9JY
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
2021-11-11 11:20 ` Peter Kjellerstedt
@ 2021-11-11 12:32 ` Jasper Orschulko
0 siblings, 0 replies; 8+ messages in thread
From: Jasper Orschulko @ 2021-11-11 12:32 UTC (permalink / raw)
To: openembedded-core, peter.kjellerstedt, jasper
Cc: martin, Daniel Baumgart, bitbake-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
> Remove " \n".
done in v6.
> You can remove "m 0755" as that is the default for install.
whoops, that sneaked back in as I was addressing Khem's comment :)
- --
With best regards
Jasper Orschulko
DevOps Engineer
Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
Jasper.Orschulko@iris-sensing.com
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
https://iris-sensing.com/
On Thu, 2021-11-11 at 11:20 +0000, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From:
> > openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org
> > > On Behalf Of Jasper Orschulko via lists.openembedded.org
> > Sent: den 11 november 2021 11:21
> > To: openembedded-core@lists.openembedded.org
> > Cc: martin@mko.dev; Daniel.Baumgart@iris-sensing.com;
> > bitbake-devel@lists.openembedded.org; Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > Subject: [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
> >
> > From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> >
> > Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
> >
> > Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 +
> > .../0001-Set-REPO_REV-to-v2.17.3.patch | 35
> > +++++++++++++++++++
> > .../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
> > meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
> > 4 files changed, 90 insertions(+)
> > 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/0001-python3-
> > shebang.patch
> > create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> > b/meta/conf/distro/include/maintainers.inc
> > index f3e0a75d56..58a0a9615f 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert
> > Yang <liezhi.yang@windriver.com>"
> > RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
> > RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
> > RECIPE_MAINTAINER:pn-readline = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>"
> > RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi
> > <Qi.Chen@windriver.com>"
> > RECIPE_MAINTAINER:pn-rgb = "Unassigned
> > <unassigned@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > diff --git a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-
> > 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..285b1d3129
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> > v2.17.3.patch
> > @@ -0,0 +1,35 @@
> > +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +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 default REPO_REV to a SHA1 that
> > corresponds to
> > +the version of the recipe. REPO_REV can still be overwriten by the
> > user,
> > +by specifying the REPO_REV environment variable.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + repo | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/repo b/repo
> > +index b13e34c..31130e9 100755
> > +--- a/repo
> > ++++ b/repo
> > +@@ -130,7 +130,7 @@ if not REPO_URL:
> > + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> > + REPO_REV = os.environ.get('REPO_REV')
> > + if not REPO_REV:
> > +- REPO_REV = 'stable'
> > ++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
> > +
> > + # increment this whenever we make important changes to this
> > script
> > + VERSION = (2, 8)
> > +--
> > +2.33.1
> > diff --git a/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch
> > new file mode 100644
> > index 0000000000..d3888c8bb2
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> > @@ -0,0 +1,26 @@
> > +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +Date: Tue, 14 Sep 2021 16:46:51 +0200
> > +Subject: [PATCH] python3 shebang
> > +
> > +Yocto does not symlink from python to python3, thus change the
> > shebang from
> > +python to python3.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + 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
> > diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb
> > b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > new file mode 100644
> > index 0000000000..cb0af89c09
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > @@ -0,0 +1,28 @@
> > +# 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"
> > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> > +
> > +SRC_URI = "git://gerrit.googlesource.com/git-
> > repo.git;protocol=https;branch=main"
> > +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> > +
> > +SRC_URI += "file://0001-python3-shebang.patch \
> > + file://0001-Set-REPO_REV-to-v2.17.3.patch"
> > +
> > +MIRRORS += "git://gerrit.googlesource.com/git-repo.git
> > git://github.com/GerritCodeReview/git-repo.git \n"
>
> Remove " \n".
>
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +do_install() {
> > + install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
>
> You can remove "m 0755" as that is the default for install.
>
> > +}
> > +
> > +RDEPENDS:${PN} = "python3"
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.33.1
>
> //Peter
>
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGNDXQACgkQYgqew07V
MNX4/Af/WThCUcxswFlmiQ94dDVWXP4hmgLGHg1rfflbzvxY+u9ZMcnd/bv3pho3
Mk+zbKj7BHgpiP/H5t6BKhwVjnNWTayywUu0Iwz5CAEggt8+TCyg6ywm2/q+VMg+
ZeIq6jLE2peAaqA/7WE8UZUMQQo0gJfEWpKJM+PzRItSgZjitlO2d77ALMZmistQ
7MFrjN7dLOzJfqn2exnX6tZjAAFXq0GDBunfSwnhnWddWL7XH13QsgAJrNlearNu
4baCgBaWyTRhp9E5L4N7fIDPQNn+Gusf1j4VCZAvHfyfefnwEY45ITui6C4nMdF2
pSaSzg2L6G3WF5ib/0Ngn4ax6cqQmQ==
=tOKQ
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3
2021-11-11 11:00 ` [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 Jose Quaresma
2021-11-11 12:29 ` Jasper Orschulko
@ 2021-12-06 15:57 ` Jasper Orschulko
1 sibling, 0 replies; 8+ messages in thread
From: Jasper Orschulko @ 2021-12-06 15:57 UTC (permalink / raw)
To: quaresma.jose; +Cc: openembedded-core, martin, Daniel Baumgart, bitbake-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
In regards to automatic update patch generation this actually is pretty
useful. I think I'll throw an extra patch on top to integrate this
suggestion.
- --
With best regards
Jasper Orschulko
DevOps Engineer
Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
Jasper.Orschulko@iris-sensing.com
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
https://iris-sensing.com/
On Thu, 2021-11-11 at 11:00 +0000, Jose Quaresma wrote:
>
> Jasper Orschulko via lists.openembedded.org
> <jasper=fancydomain.eu@lists.openembedded.org> escreveu no dia
> quinta, 11/11/2021 à(s) 10:21:
> > From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> >
> > Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
> >
> > Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 +
> > .../0001-Set-REPO_REV-to-v2.17.3.patch | 35
> > +++++++++++++++++++
> > .../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++
> > meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++
> > 4 files changed, 90 insertions(+)
> > 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/0001-python3-
> > shebang.patch
> > create mode 100644 meta/recipes-devtools/repo/repo_2.17.3.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> > b/meta/conf/distro/include/maintainers.inc
> > index f3e0a75d56..58a0a9615f 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -652,6 +652,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert
> > Yang <liezhi.yang@windriver.com>"
> > RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <anuj.mittal@intel.com>"
> > RECIPE_MAINTAINER:pn-re2c = "Khem Raj <raj.khem@gmail.com>"
> > RECIPE_MAINTAINER:pn-readline = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>"
> > RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi
> > <Qi.Chen@windriver.com>"
> > RECIPE_MAINTAINER:pn-rgb = "Unassigned
> > <unassigned@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia
> > <hongxu.jia@windriver.com>"
> > diff --git a/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-
> > 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..285b1d3129
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> > v2.17.3.patch
> > @@ -0,0 +1,35 @@
> > +From bdd2a528da59c28db8ae2986834926de7cebf3ab Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +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 default REPO_REV to a SHA1 that
> > corresponds to
> > +the version of the recipe. REPO_REV can still be overwriten by the
> > user,
> > +by specifying the REPO_REV environment variable.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + repo | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/repo b/repo
> > +index b13e34c..31130e9 100755
> > +--- a/repo
> > ++++ b/repo
> > +@@ -130,7 +130,7 @@ if not REPO_URL:
> > + REPO_URL = 'https://gerrit.googlesource.com/git-repo'
> > + REPO_REV = os.environ.get('REPO_REV')
> > + if not REPO_REV:
> > +- REPO_REV = 'stable'
> > ++ REPO_REV = '11b30b91df1f0e03b53da970ec2588e85817bacc'
> > +
> > + # increment this whenever we make important changes to this
> > script
> > + VERSION = (2, 8)
> > +--
> > +2.33.1
> > diff --git a/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-
> > shebang.patch
> > new file mode 100644
> > index 0000000000..d3888c8bb2
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
> > @@ -0,0 +1,26 @@
> > +From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00
> > 2001
> > +From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
> > +Date: Tue, 14 Sep 2021 16:46:51 +0200
> > +Subject: [PATCH] python3 shebang
> > +
> > +Yocto does not symlink from python to python3, thus change the
> > shebang from
> > +python to python3.
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Jasper Orschulko
> > <Jasper.Orschulko@iris-sensing.com>
> > +---
> > + 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
> > diff --git a/meta/recipes-devtools/repo/repo_2.17.3.bb
> > b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > new file mode 100644
> > index 0000000000..cb0af89c09
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > @@ -0,0 +1,28 @@
> > +# 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"
> > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> > +
> > +SRC_URI = "git://gerrit.googlesource.com/git-
> > repo.git;protocol=https;branch=main"
> > +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> > +
> > +SRC_URI += "file://0001-python3-shebang.patch \
> > + file://0001-Set-REPO_REV-to-v2.17.3.patch"
> >
>
>
> I think we can replace the patch 0001-Set-REPO_REV-to-v2.17.3.patch
> with a post function
> and with it we can reuse the SRCREV of the recipe. Something like:
>
> do_fix_rev(){
> sed -i "s/REPO_REV = 'stable'/REPO_REV = '${SRCREV}'" ${S}/repo
> }
>
> do_patch[postfuncs] += "do_fix_rev"
>
> > +
> > +MIRRORS += "git://gerrit.googlesource.com/git-repo.git
> > git://github.com/GerritCodeReview/git-repo.git \n"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +do_install() {
> > + install -Dm 0755 ${WORKDIR}/git/repo ${D}${bindir}/repo
> > +}
> > +
> > +RDEPENDS:${PN} = "python3"
> >
>
>
> repo uses git internally, so add it
>
> RDEPENDS:${PN} = "python3 git"
>
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.33.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#13003):
> > https://lists.openembedded.org/g/bitbake-devel/message/13003
> > Mute This Topic: https://lists.openembedded.org/mt/86978419/5052612
> > Group Owner: bitbake-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub
> > [quaresma.jose@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGuMvoACgkQYgqew07V
MNWrRgf+OEDCIgSO4O3kt8iJnkiUwqX+STyTT5wFhA1u5dMb0v03PeRhFiI/hC2H
8ghIdtg+8gpT5oCxT9ZtwUFHiuo5IrN8VXW5c4HF04mNq9otpOQD2LDhawT+T2jz
RG1zKMbhRLVwjTBZ4iD9trma8dH4vm/cXsMcdNLtpDxO2Uibr7paJ+jufaJMPCxQ
+f9fi0umDHjgm1yDfmcvZ5j1tcBsGWTkDC7qEMyTn9Rb2uddvwCh7VULbe3sTbgv
u9QYcc0yYMM378crouiLE4w4ChSNIXkHghWn8PzoEY6JOsyJkqy1b/D6uLO7BfXX
hECXXFndZh+DjOUjfvAjHgt1KyK4Eg==
=WBmN
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-12-06 15:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 10:21 [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 jasper
2021-11-11 10:21 ` [oe-core][PATCH v5 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
2021-11-11 10:59 ` [bitbake-devel] " Jose Quaresma
2021-11-11 11:00 ` [bitbake-devel] [oe-core][PATCH v5 1/2] repo: Add recipe for 2.17.3 Jose Quaresma
2021-11-11 12:29 ` Jasper Orschulko
2021-12-06 15:57 ` Jasper Orschulko
2021-11-11 11:20 ` Peter Kjellerstedt
2021-11-11 12:32 ` Jasper Orschulko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.