repo: Add recipe for 2.17.3
PATCH v6 1/2 repo: Add recipe for 2.17.3
From: Jasper Orschulko <[email protected]>
Add a recipe for repo 2.17.3, prerequisite for the repo fetcher.
--- 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
meta/conf/distro/include/maintainers.inc +1 -0
@@ -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]>"
meta/recipes-devtools/repo/repo-2.17.3/0001-Set-REPO_REV-to-v2.17.3.patch new file +35 -0
@@ -0,0 +1,35 @@ +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 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 <[email protected]> +--- + 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
meta/recipes-devtools/repo/repo/0001-python3-shebang.patch new file +26 -0
@@ -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
meta/recipes-devtools/repo/repo_2.17.3.bb new file +28 -0
@@ -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"
Signature · 1 line
2.34.0
PATCH v6 2/2 base.bbclass: Add sysroot deps for repo fetcher
From: Jasper Orschulko <[email protected]>
Add repo-native as prerequisite for the repo fetcher.
--- meta/classes/base.bbclass | 4 ++++ 1 file changed, 4 insertions(+)
meta/classes/base.bbclass +4 -0
@@ -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')
Signature · 1 line
2.34.0
Quoted 5 lines · Jasper Orschulko via lists.openembedded.org
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]>
Quoted 11 lines
--- 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 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
[email protected]
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
Quoted 23 lines · Richard Purdie
Quoted 11 lines · Jasper Orschulko via lists.openembedded.org
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 | 35
+++++++++++++++++++
.../repo/repo/0001-python3-shebang.patch | 26 ++++++++++++++ meta/recipes-devtools/repo/repo_2.17.3.bb | 28 +++++++++++++++Quoted 8 lines
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
Quoted 9 lines
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-----