* [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3
@ 2021-11-24 18:35 jasper
2021-11-24 18:35 ` [eo-core][PATCH v6 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
2021-11-24 23:07 ` [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 Richard Purdie
0 siblings, 2 replies; 4+ messages in thread
From: jasper @ 2021-11-24 18:35 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..f7bbb22964
--- /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"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+ install -D ${WORKDIR}/git/repo ${D}${bindir}/repo
+}
+
+RDEPENDS:${PN} = "python3 git"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.34.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [eo-core][PATCH v6 2/2] base.bbclass: Add sysroot deps for repo fetcher
2021-11-24 18:35 [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 jasper
@ 2021-11-24 18:35 ` jasper
2021-11-24 23:07 ` [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 Richard Purdie
1 sibling, 0 replies; 4+ messages in thread
From: jasper @ 2021-11-24 18:35 UTC (permalink / raw)
To: openembedded-core
Cc: martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
Add repo-native as prerequisite for the repo fetcher.
Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
---
meta/classes/base.bbclass | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a65fcc6c1d..b709777f24 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -665,6 +665,10 @@ 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')
+
# *.lz4 should DEPEND on lz4-native for unpacking
if path.endswith('.lz4'):
d.appendVarFlag('do_unpack', 'depends', ' lz4-native:do_populate_sysroot')
--
2.34.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3
2021-11-24 18:35 [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 jasper
2021-11-24 18:35 ` [eo-core][PATCH v6 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
@ 2021-11-24 23:07 ` Richard Purdie
2021-11-24 23:40 ` Jasper Orschulko
1 sibling, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2021-11-24 23:07 UTC (permalink / raw)
To: jasper, openembedded-core
Cc: martin, Daniel.Baumgart, bitbake-devel, Jasper Orschulko
On Wed, 2021-11-24 at 19:35 +0100, Jasper Orschulko via lists.openembedded.org
wrote:
> 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
>
>
I thought I'd try testing this. Unfortunately it doesn't build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/115/builds/1004/steps/13/logs/stdio
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3
2021-11-24 23:07 ` [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 Richard Purdie
@ 2021-11-24 23:40 ` Jasper Orschulko
0 siblings, 0 replies; 4+ messages in thread
From: Jasper Orschulko @ 2021-11-24 23:40 UTC (permalink / raw)
To: richard.purdie, openembedded-core, jasper
Cc: martin, Daniel Baumgart, bitbake-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Sorry about that. Seems I got sloppy during one of the patch revisions
and accidently formatted one of the patches from the wrong repo
revision.
Should now work with v7 on the ML.
- --
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 Wed, 2021-11-24 at 23:07 +0000, Richard Purdie wrote:
> On Wed, 2021-11-24 at 19:35 +0100, Jasper Orschulko via
> lists.openembedded.org
> wrote:
> > 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
> >
> >
>
> I thought I'd try testing this. Unfortunately it doesn't build:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/115/builds/1004/steps/13/logs/stdio
>
> Cheers,
>
> Richard
>
>
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGezXcACgkQYgqew07V
MNVN0ggAhgCUYWOdvRt1k57dHP2aS2EGxLL9vt9LZ6Bf2OMXADinYPgfWAm2gZ2S
aSdo3I0Vjlkh/rxB1uOmNpWPFL0Yitzs696vM87Jcxll9Q2xXkHBDa5Lj3Z4sUaZ
jChzXVeuKmrALFThMsXbPcJO/KXYZJRh61Pl9vLw4FWpdwezcQ0mXJ4uKGCSVhvR
yi/AlEaoh0TC/jsiU/VxaqHUMaviI/1rku/IdzkMWfsKy/Rt3ilSNQ0P6CbUI6kY
mbKd3aYzMMsYBw9pph0yHjK3QVu6Lr+GnHH15FQ4JFOhs8yXCK1Fe1Wza9RNvE32
hGmed1mOwHHwPG4CoUV2TbwD0KD/3A==
=0m9v
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-24 23:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-24 18:35 [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 jasper
2021-11-24 18:35 ` [eo-core][PATCH v6 2/2] base.bbclass: Add sysroot deps for repo fetcher jasper
2021-11-24 23:07 ` [bitbake-devel] [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 Richard Purdie
2021-11-24 23:40 ` 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.