From patchwork Wed Nov 24 18:35:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasper Orschulko X-Patchwork-Id: 79 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63C27C433EF for ; Wed, 24 Nov 2021 18:36:18 +0000 (UTC) Received: from mx.walter.deinstapel.de (mx.walter.deinstapel.de [116.202.209.171]) by mx.groups.io with SMTP id smtpd.web11.2045.1637778974904531336 for ; Wed, 24 Nov 2021 10:36:17 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="no key for verify" header.i=@fancydomain.eu header.s=mail header.b=RwYyR1bw; spf=pass (domain: fancydomain.eu, ip: 116.202.209.171, mailfrom: jasper@fancydomain.eu) From: jasper@fancydomain.eu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fancydomain.eu; s=mail; t=1637778971; bh=qpkqVaCjshWLBXDniX50fPs9G0QI5Hrmcxe+OpwCgr0=; h=From:To:Cc:Subject; b=RwYyR1bwXM+Ayzy/9eNl3eoJlwK+yJtlse2J5OlffhdP4Sit8IBuzcbGQm6aslwxu nUx2zSBWgnusCAEaqbaOBpu5BqiH4k6z28gQkhe5CTkaV/0RM3Hm/WDg5PfqclxJmY QzlIVSvYPAT2PeMHWrAFxjZAXi5e6QxxAHc5GWJdwR+IIOnr9TyFKwFjNKF/ZRcu2v saNmFOHTgR21NfV9A4Sjhg2Hhcrft61d0R0imTF3oubz+9CgkVfhTZSyZGkg8e7dxf vWOYTuMO3dQVnvdQ6S8RMNTEHNw+bzoVuXNQhWVMEluXYtrwtLOjbNOi+7A27DR5io 6rKztw5i7GU9A== To: openembedded-core@lists.openembedded.org Cc: martin@mko.dev, Daniel.Baumgart@iris-sensing.net, bitbake-devel@lists.openembedded.org, Jasper Orschulko Subject: [eo-core][PATCH v6 1/2] repo: Add recipe for 2.17.3 Date: Wed, 24 Nov 2021 19:35:39 +0100 Message-Id: <20211124183540.39312-1-jasper@fancydomain.eu> Mime-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 Nov 2021 18:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13099 From: Jasper Orschulko Add a recipe for repo 2.17.3, prerequisite for the repo fetcher. Signed-off-by: Jasper Orschulko --- 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 " RECIPE_MAINTAINER:pn-quota = "Anuj Mittal " RECIPE_MAINTAINER:pn-re2c = "Khem Raj " RECIPE_MAINTAINER:pn-readline = "Hongxu Jia " +RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko " RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi " RECIPE_MAINTAINER:pn-rgb = "Unassigned " RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia " 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 +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 +--- + 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 +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 +--- + 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" From patchwork Wed Nov 24 18:35:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasper Orschulko X-Patchwork-Id: 78 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E23AC433F5 for ; Wed, 24 Nov 2021 18:36:18 +0000 (UTC) Received: from mx.walter.deinstapel.de (mx.walter.deinstapel.de [116.202.209.171]) by mx.groups.io with SMTP id smtpd.web11.2047.1637778977213837861 for ; Wed, 24 Nov 2021 10:36:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="no key for verify" header.i=@fancydomain.eu header.s=mail header.b=I8FHsooS; spf=pass (domain: fancydomain.eu, ip: 116.202.209.171, mailfrom: jasper@fancydomain.eu) From: jasper@fancydomain.eu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fancydomain.eu; s=mail; t=1637778973; bh=UCHZaJuxFw+PJISigau4cNc/BIjVaeL0gFLCi9eWNsk=; h=From:To:Cc:Subject:In-Reply-To:References; b=I8FHsooSVD0ghAGZ8g6LLtRnkGWAX1GeSa2BtJ5n2XlG9dhngp+gOiZrmYRSUduuA XLxLt1vsPyxOSkyzoueFdM6w4Nzo1Hr+ZCTysUtuGiP9EldRIVb2FTlLp721BXDBlc dEuH7OV1ypd6bwU3JPmvU161Ct//GAfV4lpXqUM3r4iXJqp9eVsNNyDvexjoV7EkOk Okp38lugTcQ9odtUtcPCA6PkVrrIb9Lesra6xjQPBvoVXgnyPmIBmHrn8RnvC3gTiC bX5/41t/2qSbGSlsGlA6T1rzJwwzpSEl/QTuZ65gj7q3aS+bTXh+M4oDGMUvp7A0D+ QkDp7BI9p11kA== To: openembedded-core@lists.openembedded.org Cc: martin@mko.dev, Daniel.Baumgart@iris-sensing.net, bitbake-devel@lists.openembedded.org, Jasper Orschulko Subject: [eo-core][PATCH v6 2/2] base.bbclass: Add sysroot deps for repo fetcher Date: Wed, 24 Nov 2021 19:35:40 +0100 Message-Id: <20211124183540.39312-2-jasper@fancydomain.eu> In-Reply-To: <20211124183540.39312-1-jasper@fancydomain.eu> References: <20211124183540.39312-1-jasper@fancydomain.eu> Mime-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 Nov 2021 18:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13100 From: Jasper Orschulko Add repo-native as prerequisite for the repo fetcher. Signed-off-by: Jasper Orschulko --- 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')