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

Hi Jose,

whoops, good find! Yeah... I would also prefer to inject the REPO_REV
as an environment variable within the bitbake build process rather then
hardcoding it with a patch, but I am not sure how and if this would
work? I am open to suggestions! :)

> injecting SRCREV after unpack will be better imo

I am not sure I completely understand what you are saying here. Are you
saying, that the SRCREV in the recipe should be set somewhere else?

Cheers!

- -- 
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/





On Mon, 2021-11-08 at 12:23 +0000, Jose Quaresma wrote:
> 
> 
> Jasper Orschulko via lists.openembedded.org
> <[email protected]> escreveu no dia
> segunda, 8/11/2021 à(s) 11:59:
> > From: Jasper Orschulko <[email protected]>
> > 
> > Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
> > 
> > Signed-off-by: Jasper Orschulko <[email protected]>
> > ---
> >  meta/conf/distro/include/maintainers.inc      |  1 +
> >  .../0001-Set-REPO_REV-to-v2.17.3.patch        | 34
> > +++++++++++++++++++
> >  .../repo/repo/0001-python3-shebang.patch      | 26 ++++++++++++++
> >  meta/recipes-devtools/repo/repo_2.17.3.bb     | 27 +++++++++++++++
> >  4 files changed, 88 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
> > <[email protected]>"
> >  RECIPE_MAINTAINER:pn-quota = "Anuj Mittal <[email protected]>"
> >  RECIPE_MAINTAINER:pn-re2c = "Khem Raj <[email protected]>"
> >  RECIPE_MAINTAINER:pn-readline = "Hongxu Jia
> > <[email protected]>"
> > +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko
> > <[email protected]>"
> >  RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi
> > <[email protected]>"
> >  RECIPE_MAINTAINER:pn-rgb = "Unassigned
> > <[email protected]>"
> >  RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia
> > <[email protected]>"
> > 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..3086f8eb42
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> > v2.17.3.patch
> > @@ -0,0 +1,34 @@
> > +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 a SHA1 that
> > corresponds to
> > +the version of the recipe.
> > +
> > +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
> > 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 <[email protected]>
> > +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
> > <[email protected]>
> > +---
> > + 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..9e5282cc9b
> > --- /dev/null
> > +++ b/meta/recipes-devtools/repo/repo_2.17.3.bb
> > @@ -0,0 +1,27 @@
> > +# 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
> > "
> > +SRC_URI += "file://0001-python3-shebang.patch"
> > 
> 
> 
> meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-
> v2.17.3.patch
> ^ this patch is not used on the recipe, anyway injecting SRCREV after
> unpack will be better imo
>  
> > +SRCREV = "11b30b91df1f0e03b53da970ec2588e85817bacc"
> > +
> > +MIRRORS += "git://gerrit.googlesource.com/git-repo.git
> > git://github.com/GerritCodeReview/git-repo.git \n"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +do_install() {
> > +       install -d ${D}${bindir}
> > +       install ${WORKDIR}/git/repo ${D}${bindir}
> > +}
> > +
> > +RDEPENDS:${PN} = "python3"
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > -- 
> > 2.33.1
> > 
> > 
> > 
> > 
> 
> 
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGJGTYACgkQYgqew07V
MNXCcwf/f7giPAf23IaVSPEj1KzaUvh6mt2NqxsWx44EsK0CbIMw6mjnGQXcz+Ef
zrIp3sq0STiNhbDVkXfPbHxeJ7kp0M7mf2ow0oxjEw0V529J/Scn7lLGb3xlfPtr
rU5Pg7GMu53w7cqgq1bz4d1f0II2w3ijd+Vgvx8QdYHTiP/2/I+7cYvH9PSWUE/S
JFuRaJF9ZkPsJlr5+xFj6ldS40YdRWZM/Gu/Gmt9VBMuX70VneJM03mKTlkxuLAH
lJ0SiEZUHNV6ZzgbKip2DGHO7PVE47O09AnA+UP393bN11ShiFiPppfylm1ruJVz
MPZLrW75E1qm/rSJ6B0GG+fJ76PZEA==
=1Jyw
-----END PGP SIGNATURE-----
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157978): 
https://lists.openembedded.org/g/openembedded-core/message/157978
Mute This Topic: https://lists.openembedded.org/mt/86903949/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to