> -----Original Message-----
> From: [email protected]
> <[email protected]> On Behalf Of Jasper Orschulko via
> lists.openembedded.org
> Sent: den 11 november 2021 11:21
> To: [email protected]
> Cc: [email protected]; [email protected];
> [email protected]; Jasper Orschulko
> <[email protected]>
> Subject: [oe-core][PATCH v5 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.
>
> 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 +++++++++++++++
> 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
> <[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..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 <[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
> 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..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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158167):
https://lists.openembedded.org/g/openembedded-core/message/158167
Mute This Topic: https://lists.openembedded.org/mt/86978420/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
