From patchwork Sat Nov 27 09:53:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 460 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 66F06C433F5 for ; Sat, 27 Nov 2021 09:54:10 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.34223.1638006849620849489 for ; Sat, 27 Nov 2021 01:54:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VshU9VRB; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id d24so24124511wra.0 for ; Sat, 27 Nov 2021 01:54:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3zCE1N1qJSgogZLdW7x72KnbCVEfnFkNR2/dul1rRzI=; b=VshU9VRBFwfaUHPirtqTRvbESeV7RU+e2cDELBRNtMgD4jYjynSzW5rzi29L479/fJ DPYKy5rMBtnkicP1/J0XMec1otWEHvPz9FMiys7KjDl971ZIqWIA7/bgXmhPv+yCYXIM FV/k5WNhKzPOTg8thlP+6RDA9imrVKLdzH1EOBzFe0PltoQIiwFdI5nZV+Acyx4N9CbC JaAeh0g/42lYsLYiU2/wyhgxSNPEOnPZyHXGby6oNmmIN2ULM+/N/UItf2NTpcpX73RZ zsKIPvYNEQ6L/58AsabwmZPBSBQe5NGDvXOHI7mxWAXWbDw19LLi6YiXQOtYhZ47/G9A Tn2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3zCE1N1qJSgogZLdW7x72KnbCVEfnFkNR2/dul1rRzI=; b=xsh0fgtxl4ibqCVE2im1cFD3qV4Tp7fp/9yu25dcWh4Inido2ewVaNVt7xLePjnXLi eMiAjpAW4qxMVHzK3OdQuPbi6ut1tcEq3/L/aYMDKnOKulKesV9CJ3m9jZ5bLVgSFsIO ODl9kMtqcFvZd4XWk2eSBec/T6V4i9c9MkrG3YiQcgQUsjZyfq44LdlsjSJB8Z2ii6AI txAjx8oyTj73cOvu0VuLMLcGKuyQ3ciPS/q/Ge848R8YSZP9FKiAd5qNeVUa5v9+Qu2d CAqEFI0v3DsMfIhJe07ucQrC03jvmtYlra9HN6W0q3vUmQppPLsJJMb+B6gdEULeo/JS 0cBQ== X-Gm-Message-State: AOAM530eZ5zVcxPDQLd51nXwRPwgreqykPm6T6oiDQ0s0GNOZoXoICva Fg+FaTAg+V05tjBq+f2m3IgfGXjP826wRA== X-Google-Smtp-Source: ABdhPJwaGYr0sbkHa4PNAsoRzU9dPSe2B/c47aLdLGUp45l4R8M9QukKLsoIezblXJiSuv5abzOjYQ== X-Received: by 2002:adf:f40b:: with SMTP id g11mr19378424wro.296.1638006848083; Sat, 27 Nov 2021 01:54:08 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/13] insane.bbclass: add a check that Upstream-Status patch tag is present and correctly formed Date: Sat, 27 Nov 2021 10:53:45 +0100 Message-Id: <20211127095357.1748429-1-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 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 ; Sat, 27 Nov 2021 09:54:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158850 Signed-off-by: Alexander Kanavin --- meta/classes/insane.bbclass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 27b1a00fb9..240f3aad62 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1167,6 +1167,30 @@ python do_qa_patch() { bb.warn(msg) msg = "Patch log indicates that patches do not apply cleanly." oe.qa.handle_error("patch-fuzz", msg, d) + + # Check if the patch contains a correctly formatted and spelled Upstream-Status + import re + from oe import patch + + for url in patch.src_patches(d): + (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) + + # skip patches not in oe-core + if '/meta/' not in fullpath: + continue + + content = open(fullpath, encoding='utf-8', errors='ignore').read() + kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) + strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport)( .+)?$", re.MULTILINE) + match_kinda = kinda_status_re.search(content) + match_strict = strict_status_re.search(content) + guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" + + if not match_strict: + if match_kinda: + bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) + else: + bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) } python do_qa_configure() { From patchwork Sat Nov 27 09:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 464 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 63121C433FE for ; Sat, 27 Nov 2021 09:54:14 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.34224.1638006850127963872 for ; Sat, 27 Nov 2021 01:54:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RiRAEuX7; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id u1so23990495wru.13 for ; Sat, 27 Nov 2021 01:54:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=677i5uxuFFktxmLb96torf8LG7lqAHz70CrpJrpMBX8=; b=RiRAEuX799fxCvzhOcNvD1Kd3ENLzoCnilkeMieiX24ATgHdfWTb4EpvySrFn49fqI kxh4ngeq+I8isDzeQ6VknsbPShos4OKdwZ+5V2wEdfWDLGbMzeeGhcCwVHRDbwBoGd+v oJv2qaccem6A8vWuO5TQX67A5s2O5Upr4F1hQUGmXPw+bqj+8mAg47lDNq2qvQS44BKN lzjWXlHx4TjoQdEdg/v1kfPMU+SDrYwqVMRTXcSSYREQ+LdwAjzSgMtrRWj+DD6a9VHz aiGvd+nbJvsIZUcVga88Qg9wbAqz2JDMsNacbXpgg3apyPwA/fEJOBHCFkgirk8QbTQV CP+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=677i5uxuFFktxmLb96torf8LG7lqAHz70CrpJrpMBX8=; b=BnrcRsmkIhEg2533YBsRT4z5XnwQUXRvGNFAWA95T/NpgS4eSdALgRVpj4mqRroPFp QOjzEYgiF+A5E1M+mV9AJQuxqQcjaLl/fi/lfsvrtqCdKksrbJ611ti0XdW6sI3RDLqR 4s0VC530it9vuCCZU2najDKa5YI732h3vd/gucmUnH3hteNXPu2vrIIaXEmie2ZDzS0J TPWJpq3ftJMDtM2sgiue7Ht8PJTiRsE98SdITpFpuGgqSzN0FaRs/B5SXhSBxO43Bt6e TM0sG0sAr9gF77KYz72mKT/xt9c+p84aMTmspII3oBRIjLaCjxWYiz681mQ1ahiknFTv onqQ== X-Gm-Message-State: AOAM532P2tjvAsIDV7EKbX24zOGTvVPbCCALyMPD1rF6V4rG4WAGonEG 2ggkI8T3kK2GyIONrpPn7jCSeeouqVt1iQ== X-Google-Smtp-Source: ABdhPJwLz+zbVEijSspZy7qn/xo3zoTKZS36I0N4uXKCY3ehS6YFfPSxfiAuhU3xJum6RkiApOhHMA== X-Received: by 2002:a5d:6d41:: with SMTP id k1mr19898978wri.134.1638006848708; Sat, 27 Nov 2021 01:54:08 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/13] insane.bbclass: do not hardcode oe-core path in upstream-status check Date: Sat, 27 Nov 2021 10:53:46 +0100 Message-Id: <20211127095357.1748429-2-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158851 Signed-off-by: Alexander Kanavin --- meta/classes/insane.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 240f3aad62..8a47da5a09 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1176,7 +1176,9 @@ python do_qa_patch() { (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) # skip patches not in oe-core - if '/meta/' not in fullpath: + oecore_re = re.compile(d.getVar('BBFILE_PATTERN_core')) + match_oecore = oecore_re.search(fullpath) + if not match_oecore: continue content = open(fullpath, encoding='utf-8', errors='ignore').read() From patchwork Sat Nov 27 09:53:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 472 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 57AE3C433F5 for ; Sat, 27 Nov 2021 09:54:19 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web08.34528.1638006851116938742 for ; Sat, 27 Nov 2021 01:54:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gXhB2Qff; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id a18so24056137wrn.6 for ; Sat, 27 Nov 2021 01:54:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FORYkV8iaQHupPIL/w9yEojFziJc71U0HyVbmX3ZCMY=; b=gXhB2Qff0XHm7ldmnQ4gH5hVx/SL4RVnYZe5dYi/cnvPPUD8SyURScTYJM+5GKW0/V kOW+WFokvJKoqUdiCWtkiwqAYzY2g8HwgU7ZHEpUXuUbPPes/NRHryZbMKv5bnvLcMEz r0hqP7UQuH291KFBke/IezeSpcsrzFpLZPlIuU/HHQbrDrTz7BeiEn4J2mbecEfxRC5/ Dska5HUu/NMAtU98mC/fLV6PAbEk10cPimsY4GTJK1ZBh5Lepi8nF/OjpdOJFDsaYDu9 OtB128krdYCT44hQMIG5sSCnJmydZsv4SOIl5QEd6ee2or7cFByE+R4LHIHTjNEzMgY3 aKXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FORYkV8iaQHupPIL/w9yEojFziJc71U0HyVbmX3ZCMY=; b=06wX6omlf9mE/eU6NiH/U4XEvNHhfyrNYXmqvITfcfh+3PgxwhLgsbaMQVRlhfFtrH qetXvnUixi1Ck2UU3a4MKi7IJZJCR6NrisMsg0mXPlHbV64IZDhpNj/72zyNxLnIJiuc W4YmAddPNhII0x7WuCIoV/K9X3Jic42xVDAxCe+EfRXcZZac6OTWOvFqgzqok0i9nI2y Ssm0fW7Fc5Q0jPkj41IcHaoB8JetM/QOtFea5p5zTogRdKT+rEkRCmgW4R7qebuj6KJi CAbSnknc4GyOe+PsBNeJ5cXbn+Vy/KVBoM0pWfWFbtwut/W4fK23ldEJ8Nx2uUv0rjxW xYmw== X-Gm-Message-State: AOAM532Gpd6toUi9jRihPu7xjRV20oVvU+7a/FlM3OegsJWYPjNNeuUa ou2tKwQo2X3/jaG/fRsXBBIo11yfDxZxiQ== X-Google-Smtp-Source: ABdhPJwAWmZV53gH3vA+ntBVGcNgcXj/kuWIvJA/LLOXvPDRu2oxtKkh4TEH4RNwW1BZxk0j3F8ykQ== X-Received: by 2002:a5d:4343:: with SMTP id u3mr20010537wrr.450.1638006849720; Sat, 27 Nov 2021 01:54:09 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin , Ross Burton , Alexander Kanavin Subject: [PATCH 03/13] ovmf: remove patch merged upstream Date: Sat, 27 Nov 2021 10:53:47 +0100 Message-Id: <20211127095357.1748429-3-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158852 See here: https://github.com/tianocore/edk2/pull/1513/files The change was thus applied twice to the same file. Signed-off-by: Alexander Kanavin --- .../ovmf/ovmf/0004-Strip-build-paths.patch | 32 ------------------- meta/recipes-core/ovmf/ovmf_git.bb | 1 - 2 files changed, 33 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch diff --git a/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch b/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch deleted file mode 100644 index dfb8a73398..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7cfe97895e0586d14403ba98e62a0cd9373da96 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 14 Jun 2021 19:55:08 +0200 -Subject: [PATCH 4/6] Strip build paths - -Pass --zero to GenFw in release builds so that the sections that link back to -the intermediate binaries (containing build paths) are removed. - -Upstream-Status: Pending (discussion at https://bugzilla.tianocore.org/show_bug.cgi?id=3256) -Signed-off-by: Ross Burton - -Signed-off-by: Alexander Kanavin ---- - OvmfPkg/OvmfPkgIa32.dsc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 33fbd76790..06c6d5ce60 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -91,6 +91,8 @@ - - !include NetworkPkg/NetworkBuildOptions.dsc.inc - -+ RELEASE_*_*_GENFW_FLAGS = --zero -+ - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] - GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 - XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000 --- -2.32.0 - diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index ce3b650ddf..80b9c1447f 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -19,7 +19,6 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-Update-to-latest.patch \ - file://0004-Strip-build-paths.patch \ file://0005-debug-prefix-map.patch \ file://0006-reproducible.patch \ file://0001-Fix-VLA-parameter-warning.patch \ From patchwork Sat Nov 27 09:53:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 462 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 5DC6FC433EF for ; Sat, 27 Nov 2021 09:54:14 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web12.34454.1638006852067843251 for ; Sat, 27 Nov 2021 01:54:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BkhEbqlV; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id m25-20020a7bcb99000000b0033aa12cdd33so3542466wmi.1 for ; Sat, 27 Nov 2021 01:54:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZThXnTALsmzt+Mxsrl1B+3Ag1I4DlN3dyKYkLBZ7vd8=; b=BkhEbqlVTTl/bay+ZAZd2dCKVH/j3C9BQmP2v+JQClI1gJvjGSVhvLcdRz0PvYAR9F McT/ZQbwcaQhUmPIwa/u/gCTggnnxVPvbA1JMp2/e5wHgRSJcSFopQBC7C3LtvFn+alw 5w6nwqHFiXQE6i3YTBm30Jgapr60ZSrdKwpDtETUF0w/8iR1zhEkNa70xrALbhOqaSJP K4LzuOhvpXE81gCAxthnz469U/jvcN9nL8YGZt5xpfG/HL5dlt+CokPH0jVbPjxQG9XZ Oo5MiewH+2SoZGGQF7a3EI9g/EMmba8YqfoEpPmvc07FZ+tsUGDu2B3Rsm8G5gHHyirC eWPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZThXnTALsmzt+Mxsrl1B+3Ag1I4DlN3dyKYkLBZ7vd8=; b=bBLz7e3dhfhePIlmaayCY+j+LbSy/H7Iw2/Y3+/D6PDd9/wiLqCuo3/9cdhlrt+RHX vkhp+BjDRwx9UZ6n2VwkK9No3WWir1lrHICSCpTaPM13mcb1OCJyF6dhv4j9fpwkRWst L0Ct1bc+ev4F07RpENJBGw+3wjaNLxzIrdziah62v5yxKQHCa2kDvasdX5rU3f8YcTMr S5aJU1ZyNrNqAZLTUf054OKp+8C5eBEahdDQwpilhh1xC6R2CZT8Ei9/OVzqAc55M8Y+ vMBXEpq98A2PXDjCsmHbo7U0HXLmvORS34JRq1AgJT19BHNOQQjB7BiQkYBJrum8ILLE ShTQ== X-Gm-Message-State: AOAM530ZbcaPZnFMjxtLsHgK/VRz5QMImuQSX6c3Om0GMmaucEFAShIr zU+JSNvZ/BO5UJyYrICWyTSUagWvkcwgSg== X-Google-Smtp-Source: ABdhPJxoZcrtGLw+Qo1gzbhLAsBGtvc+GXNUL04zENCVG/KRLP8CzZY98D17vW6VZiXzOlEzkV3R1w== X-Received: by 2002:a1c:a592:: with SMTP id o140mr21638206wme.10.1638006850379; Sat, 27 Nov 2021 01:54:10 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:10 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin , Alexander Kanavin Subject: [PATCH 04/13] libcomps: remove unneeded patch Date: Sat, 27 Nov 2021 10:53:48 +0100 Message-Id: <20211127095357.1748429-4-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158853 Somewhere along the way the issue was fixed upstream. Signed-off-by: Alexander Kanavin --- .../0001-Add-crc32.c-to-sources-list.patch | 50 ------------------- .../libcomps/libcomps_0.1.18.bb | 1 - 2 files changed, 51 deletions(-) delete mode 100644 meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch deleted file mode 100644 index 76fce19767..0000000000 --- a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 72065bb2b5881dc224299f302379391aebdfca3d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 21 Nov 2018 13:09:05 +0100 -Subject: [PATCH 1/2] Add crc32.c to sources list - -Otherwise, there is a missing symbol runtime error under musl C library. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - libcomps/src/python/src/CMakeLists.txt | 4 ++-- - libcomps/src/python/src/crc32.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt -index 89b9c91..08cd6b5 100644 ---- a/libcomps/src/python/src/CMakeLists.txt -+++ b/libcomps/src/python/src/CMakeLists.txt -@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) - set (pycomps_SRC pycomps.c pycomps_sequence.c - pycomps_envs.c pycomps_categories.c pycomps_groups.c - pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c -- pycomps_hash.c pycomps_exc.c pycomps_lbw.c) -+ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c) - - set (pycomps_HEADERS pycomps_macros.h pycomps_sequence.h - pycomps_envs.h pycomps_categories.h pycomps_groups.h - pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h - pycomps_hash.h pycomps_exc.h pycomps_lbw.h -- pycomps_types.h) -+ pycomps_types.h crc32.h) - - #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py - # utest.py) -diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c -index d8f5e34..f266067 100644 ---- a/libcomps/src/python/src/crc32.c -+++ b/libcomps/src/python/src/crc32.c -@@ -41,7 +41,7 @@ - */ - - #include --#include -+#include - - static uint32_t crc32_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, --- -2.25.1 - diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb index 3fd4d5b83d..ff6ecc7601 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb @@ -5,7 +5,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ - file://0001-Add-crc32.c-to-sources-list.patch \ file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " From patchwork Sat Nov 27 09:53:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 461 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 5AF34C433F5 for ; Sat, 27 Nov 2021 09:54:13 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web12.34455.1638006852473726761 for ; Sat, 27 Nov 2021 01:54:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I7apxW+d; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id a9so24064613wrr.8 for ; Sat, 27 Nov 2021 01:54:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wq5RFMEpVJpmHMtjmVEZAyjN34GmGxoJGpKlkeDJ/KM=; b=I7apxW+d6TxApma9TBnrJtGuCuBrhk5iZK7YVnLGdaIaudXEsZ6KW6YycuY7UsZu5t YG5s+AXpXVBtFcOXOryBJSzdF1YQTwg/6SSAF3WjurfXyEG7tKuDqksU/FLaXb8HPCGz /71Xq2ydSOf2JCqVXQ8I+ESIg+trDCZRYrFrKUxlIopmSGnc+oxDDakwNvsKsCysH3fG IE1xuzC1SAFg+yOf6ektPR7CAiL9WOU3Ah2pPPHuvyeypq0+6y80YcRKPXXUAHBJX09W IPoa6XnZOx2U22GLtuHiU6ro0YI5d3OJxlhpnM5Clf2rpZVRbLgI6lAudAhQuBqK7MDK Q5nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wq5RFMEpVJpmHMtjmVEZAyjN34GmGxoJGpKlkeDJ/KM=; b=muLIr56ZqtHnAy6d0vpeDIs+mJQfiT1FQo+7QLC5YcwkmjGu5gR6nsBFhII7kD58US mT74zQKVzq9LLqu3UthwxcYOFwh/kea71xAYuN1sMWP5YkFasxO0k2YPlOFkpdoFysAj AFv/xTTSJtciFRjceP9recnAZbyEWaM299HTTTkoyvopEYl6yr4hxdB16KoiFloX4PTG quA08tcIoHYDQNjjyrE6GqgvjxwXOsxHtDDcD0ocwTNuKdzUzAKGtowcxeJPXj4P8jdr Cj6bocZMUUoht+VNFddhi/OEQV9/BG7OrmJzfxDUHacjS6HNP0QQsCz8I6UQ/OFkg450 y3Jw== X-Gm-Message-State: AOAM530Q2qF4mko/atadCtFASFYckwTVa5H+7OCkMF9cP/jiDqd0v+EV 2I8na0w0Cd0e68URPo+yblK/yKpENaBq+g== X-Google-Smtp-Source: ABdhPJz1IKjax9638wmqxBNpFy2WpoWWCxClqTAN7TQZ3F0EJcEyYTYdYavOFABmTxJEvh3e+Jaydg== X-Received: by 2002:adf:d22e:: with SMTP id k14mr20029912wrh.446.1638006851098; Sat, 27 Nov 2021 01:54:11 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:10 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/13] libdnf: submit patches upstream Date: Sat, 27 Nov 2021 10:53:49 +0100 Message-Id: <20211127095357.1748429-5-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158854 Signed-off-by: Alexander Kanavin --- .../libdnf/libdnf/0001-Add-WITH_TESTS-option.patch | 2 +- ...1-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch index 384add5e12..607995a394 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add WITH_TESTS option This makes a dependency on cppunit optional. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1382] Signed-off-by: Alexander Kanavin --- diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch index 6dd7c71aae..2d8213cc87 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch @@ -3,7 +3,7 @@ From: Alexander Kanavin Date: Tue, 19 Nov 2019 13:46:09 +0100 Subject: [PATCH] Look fo sphinx only if documentation is actually enabled -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1383] Signed-off-by: Alexander Kanavin --- docs/hawkey/CMakeLists.txt | 20 +++++++++++--------- From patchwork Sat Nov 27 09:53:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 465 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 6048BC4332F for ; Sat, 27 Nov 2021 09:54:14 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web12.34456.1638006853178199410 for ; Sat, 27 Nov 2021 01:54:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U/6PtvzM; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id d72-20020a1c1d4b000000b00331140f3dc8so8354744wmd.1 for ; Sat, 27 Nov 2021 01:54:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MGkxDOT5ZR45gfvPLr1spWpIfc9wU9uktLkbaUTRTgw=; b=U/6PtvzMmmcLTPIVbEEptygAVvgIqZCO1ZsJKmdm0gAEQVxmhAsAP4Eqg9uywcZyK1 j+4Dhaot7V88nFaqiLkXFKNHkY5TttJjX921gTxZ6Q+yl1+/uCaLB8Wupq5A5RCPNLb6 CAPCyrdT4GZTH15CEiFLwfQB9mKIWfZzX9BxKF8A6sBSOtaRp9NNekQYu04XlWh4SWo2 U45xF76jY+e5QNRJa3mWMELYHLrNb1vJVZo0i7C6U6dHLbzv9At+CnVeF4wOWRKLcA6y rk+gpbWit1fLYydV7+m9iGmN/TFYiixf0aA9ZM9tqC86NNmBSxPKf+ege+b1f/JslUbG Dqag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MGkxDOT5ZR45gfvPLr1spWpIfc9wU9uktLkbaUTRTgw=; b=E5TVscqOdTt31rq+VOHCeZcKroqpZk69Fjo5afXGY0Y/T07eMn9QMn0LnQk6sGyNya PFVGcsfm+UdLxB9rt9hpqay9WFawfes3uoiLqOyjCCoxJELW2dk7vq9pwsxd+7aiJiDS udFmDOfV1QSLybqoVIQ0AdYWOse4S1CPFVeO6VP6YqtCipvj7rM5ghELuXhuJ4vN/iq/ He05JpkWPkTJowfE2LJwtOiR0KtK1UplAQn8QaCOqvcMC4qDII2MkdRvhxzj1az3vz6y 8qJCFaln4ZnG2eaJ1oYZOfsWUR5gFID81sbkpOOx1dhCfiVAXAhtkxtYhVnKm/TMM/lZ fu2A== X-Gm-Message-State: AOAM532BrYxeZD2ImEFW2BFstTPnFrJbq6USsPdhGnNpQXLluQxIW9EF piXJ7RcwWmxIwsd3BonOYTz9AqUzTTRlwg== X-Google-Smtp-Source: ABdhPJx4pAzKPAydRW98tFM+jX8dUG6pfQGl/5dw8V9ttAwb/SD4N2xRNnz2Jjk6A0jZS7GvWluOYw== X-Received: by 2002:a7b:c1d5:: with SMTP id a21mr21578879wmj.14.1638006851751; Sat, 27 Nov 2021 01:54:11 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:11 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/13] meson: submit patch upstream Date: Sat, 27 Nov 2021 10:53:50 +0100 Message-Id: <20211127095357.1748429-6-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158855 Signed-off-by: Alexander Kanavin --- ...oc-fix-issues-that-arise-when-cross-compiling.patch | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch index ce90e515da..ab4d5969d9 100644 --- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch @@ -3,16 +3,10 @@ From: Alexander Kanavin Date: Fri, 4 Aug 2017 16:16:41 +0300 Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling -Specifically: -1) Make it possible to specify a wrapper for executing binaries +Make it possible to specify a wrapper for executing binaries (usually, some kind of target hardware emulator, such as qemu) -2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will -try to guess them, incorrectly. -3) If things break down, print the full command with arguments, -not just the binary name. -4) Correctly determine the compiler/linker executables and cross-options when cross-compiling -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/9627] Signed-off-by: Alexander Kanavin --- From patchwork Sat Nov 27 09:53:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 467 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 50B33C43217 for ; Sat, 27 Nov 2021 09:54:15 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web09.34435.1638006853902971299 for ; Sat, 27 Nov 2021 01:54:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ItTPgW2K; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id o19-20020a1c7513000000b0033a93202467so8370022wmc.2 for ; Sat, 27 Nov 2021 01:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FaTnVQT47cZmiR7EDaolLLWCJrIdjpZBZRskIQ8q1xM=; b=ItTPgW2KG7+5PThCfihX6Mf+K7iBMrQF4O0lmUpcF7Hq+UKnnRvBH1Dek7GQZDHiRV 92VG6lVXcgG5Sa/p83PKL83LknEIWTbRE9vTuiD1cxRaCPe9aFEplaQ7LkNJsmbG6GpR jv+uoetRhYVEN+FJSwzvF3uyzE93x+hl5/+vdNPjviKkNuUOcfAo42oZ8V0KrG9XHYA9 uSLFQxLMQ5F7Y5+r+DsPY6Xbpiw6VXBq81/+1D5QgbBjOZ6Oq3z6vM2R5y6osCOwq78L OcV1RZDaia//xVzrRpMYNPwpJoF5RoUPKL3XILbnq87z9SgX0FJsCc9ABNItTlTi9ZqJ ptZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FaTnVQT47cZmiR7EDaolLLWCJrIdjpZBZRskIQ8q1xM=; b=zQnrUENTKTcZcll45G+XU8so18DoAoFCw6imcWb69eGaCH/nlPHxEihgS3aNmcaTt9 b5QSoN4pcXm9cDxotmqzjYaYU1g9EQu/MnIVwrjWc1tRHY/XYcMFm+adeO9+y0ut0bf+ qyAXQ8vliHXWQGinia0A5Z5RrIhGjMH4yfH79lyLIqwIrTuWSLhHFA3nNyDx06RfG6e2 1yONDxkS48szV4WhvdSsZo97AKIULSKzMSGmRdtHd2hUKVtQ2/a+Z9nt3VLMtR/ipCh3 NhaLr8zzp9HQe0zJ12IjcZ8jSOwC3167Y4Bxv8LewV/4CG5LHl1IQMeUPt1QUOgFjpc3 BvLg== X-Gm-Message-State: AOAM533xDiGnLaMpz+ZdLz1vVScNvGC714fpxVvfEdxQ07dfkNawIM4y DDLn55vALFNXmEGgP+VFXSl+tBaVd7GFPw== X-Google-Smtp-Source: ABdhPJye4fJ9VK0IP5YnSbtwCOlSrGkJPlLDYAAuOImFhxezpnvxLOkBZPUikquklXSpvRr16INfXg== X-Received: by 2002:a1c:43c2:: with SMTP id q185mr21214193wma.30.1638006852421; Sat, 27 Nov 2021 01:54:12 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:12 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/13] perl-cross: submit patches upstream Date: Sat, 27 Nov 2021 10:53:51 +0100 Message-Id: <20211127095357.1748429-7-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158856 Signed-off-by: Alexander Kanavin --- ...1-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch | 2 +- ...1-configure_tool.sh-do-not-quote-the-argument-to-comma.patch | 2 +- .../0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch index 3b0fc453e5..386ea3f27f 100644 --- a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch +++ b/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch @@ -4,7 +4,7 @@ Date: Wed, 2 Jan 2019 17:55:35 +0100 Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library path -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/123] Signed-off-by: Alexander Kanavin --- diff --git a/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch index 0aaeaa29eb..1d90b0fda7 100644 --- a/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch +++ b/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch @@ -5,7 +5,7 @@ Subject: [PATCH] configure_tool.sh: do not quote the argument to 'command' As it seems to break things if the argument has spaces and arguments in it. -Upstream-Status: Pending +Upstream-Status: Backport [443f7bd08b19e71a2e838dcb6cde176998cd350f] Signed-off-by: Alexander Kanavin --- cnf/configure_tool.sh | 2 +- diff --git a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch index e7985036a0..6c3f08c432 100644 --- a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch +++ b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch @@ -3,7 +3,7 @@ From: Alexander Kanavin Date: Tue, 27 Nov 2018 15:37:40 +0100 Subject: [PATCH] perl-cross: add LDFLAGS when linking libperl -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/122] Signed-off-by: Alexander Kanavin --- Makefile | 2 +- From patchwork Sat Nov 27 09:53:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 463 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 49E51C433F5 for ; Sat, 27 Nov 2021 09:54:15 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.34225.1638006854515054413 for ; Sat, 27 Nov 2021 01:54:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XxpMwe/9; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id p18so10035188wmq.5 for ; Sat, 27 Nov 2021 01:54:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9wXb+yJpVa/DF+BFi1zIEo1mQc/iwE4jM9EK51DJ4uU=; b=XxpMwe/9zZx1CfsfUPjG3t4DLYMBAIFaalbIOW3fX5rM+Xg+njUcyoJfU8cQFwrHai l5R2se03qF+Koq04nOnvF2fevXs7SZaMCaj/MErUDAjPSRVn5Ka7J2w4XhtEBdJkfrul 09na/dJKWwUcnZPPMbb47+Vp5wHLypxu2s8lndGAzUNVbEj1UEqL110AOoxaGDyaiIor J33O7bTdY9c4i13Wm0O//Uyh3X+tQjpibMi6WoW9a++CFOvOzP4XTtpTQ7lB/DhBkJez vICzm67vDnAE+dI9O+eMvEC5pz/U65QwRFxDYdGCem51H9+k5ARQM50+dDielgB+Myll +GLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9wXb+yJpVa/DF+BFi1zIEo1mQc/iwE4jM9EK51DJ4uU=; b=a1SrHKL2XFvmPFCLMgrXit9Lex0Hakz49sKRv5Yj6+yCVEO3me55kvVJxwxbC7nWua B+f0NtiRhLeWAOVwN146tLMVRQr1L/gWpxAZwcCCbJU5MP8TEupa9fwOSaxEMS0oGSex mAqsUkK53d3Njbxv8VrUzLuznxSlmzl6GIkEjaUw0h4Vo1KWTl4qkSPzHAii0QUaaBHW DhHJIe4K/cg+Zkj18QgWYPSCWNi6b9J8sQ5ENWkBeHH5qEQTjbKItFSr109564NPWrez tMBJ92VR6EMEAFpRJj9rzX9amEZKogqZE90sX6qKy3rsAZYT81uU7idXuHWZR9aNuo6z 9D4g== X-Gm-Message-State: AOAM530HVIDnCpnOnmS/eMN7jSkc9tbhH2OzggSS/tN6EjZEwQ0TzOmL EE9ugKnRljFy96Sl/5m2XM0UbvQ7VKAIgA== X-Google-Smtp-Source: ABdhPJxo0wB+arumajSvk7F4SqMYlpnsgvBQNShCNyVKpuDL0RzlDA23N5sRiQCE72CMFHZ6z/Wgdg== X-Received: by 2002:a05:600c:3584:: with SMTP id p4mr21368997wmq.109.1638006853137; Sat, 27 Nov 2021 01:54:13 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:12 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/13] perl: submitted patch upstream Date: Sat, 27 Nov 2021 10:53:52 +0100 Message-Id: <20211127095357.1748429-8-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158857 Signed-off-by: Alexander Kanavin --- ...1-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch b/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch index 7d5c079b2d..1acf3ddfaa 100644 --- a/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch +++ b/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch @@ -4,7 +4,7 @@ Date: Mon, 4 Jun 2018 18:33:50 +0300 Subject: [PATCH] ExtUtils-MakeMaker: add $(LDFLAGS) when linking binary modules -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/405] Signed-off-by: Alexander Kanavin --- From patchwork Sat Nov 27 09:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 466 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 4A55CC4321E for ; Sat, 27 Nov 2021 09:54:16 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web12.34457.1638006855189573990 for ; Sat, 27 Nov 2021 01:54:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=brfORvTr; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id c6-20020a05600c0ac600b0033c3aedd30aso8336496wmr.5 for ; Sat, 27 Nov 2021 01:54:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nTid/ic9NvR8Qdd5e4hLUGeVzcxumpU1xiQB9PqR3Oo=; b=brfORvTrelbLMLIA4ZQTA+IjR80nTpqdf+XOij+ml7AJzSR6MoP8bBpF3BvpVYaw4q KqAH7uroZE5s6OxKmYpGm7wdgjGVVOmKRp8MbK6FVBQgjyFuBrVlrrg5MiBeuASlJeSA yZzg6BAr5/lE2wba80F0+HoXneSGxTQlBWnS1ADAGVandoCebLI7FeaNHSc71I98369g /NHgiKCju4IsuJTJkkelGUpQuxre5IrlmzQz4/MKyBpsw0/fuESx+zw92qbCTvpnv5/e mdOMRakDlnjPzsvcGO5ghdBEgLLWkosBtVBuFhFj2fOfzz3urUf0fzX8jJHGoEyBFlhR W/qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nTid/ic9NvR8Qdd5e4hLUGeVzcxumpU1xiQB9PqR3Oo=; b=qW4BYiLu13MHzJ+qT3cunnHRjuZ78RQX+eKVKH6yIlhKoWaOrTM1qRpBzwTxYSHVDt DOf9jXRAHMqTbADnFekmPDUo+IgeersvFvgBY5rtmUQHlFYUdKGyrDbZvJpT/yclqjFJ YOSQWFkSC268mpIBQxjZ9adNfHfv/wXv6kyL/aWI7LJlB5NeojgL5QBvIurqS0Z+0YCB lSzzpGG98QRTcfYTH0S/Wa3lD9GJPwYrCPspEHAKJzXXNm6hVUdKVF49pJ2yDo7pVMVs EJ9SV8rAfUQpFWniB22soYqE4mjQ65j/uNUNrulqUrqxelzMO3UmzYT0Du7iKmR+VLZM j5KA== X-Gm-Message-State: AOAM531IKgi6XGWwtrb8vMPiWW45e+9qVGHJqVmkF4VuLNOLNLwq+w7H fHh8tghFsqr5Z79uWICwU4NCP8uZ6sQXwA== X-Google-Smtp-Source: ABdhPJwAxh7/IZ5Wkr6/yntv3NIyqDAoyxiELXNYlnSvjwKk8G3iAnAYLOSk1UTM77/k3AHz+l4N7w== X-Received: by 2002:a1c:1d04:: with SMTP id d4mr20963390wmd.103.1638006853773; Sat, 27 Nov 2021 01:54:13 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:13 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/13] testimage.bbclass: request the use of kvm by default Date: Sat, 27 Nov 2021 10:53:53 +0100 Message-Id: <20211127095357.1748429-9-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158858 In almost all cases there is no need to explicitly ask for it via local.conf or similar custom config: it is enabled in qemu_use_kvm() if target_arch == build_arch or both of them are x86 archs, and QEMU_USE_KVM is set. If that heuristic doesn't work, QEMU_USE_KVM = "" will do the disabling. Signed-off-by: Alexander Kanavin --- meta/classes/testimage.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 9980b3f626..e606de25fc 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -36,6 +36,7 @@ TESTIMAGE_AUTO ??= "0" # TEST_OVERALL_TIMEOUT can be used to set the maximum time in seconds the tests will be allowed to run (defaults to no limit). # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. # TEST_RUNQEMUPARAMS can be used to pass extra parameters to runqemu, e.g. "gl" to enable OpenGL acceleration. +# QEMU_USE_KVM can be set to "" to disable the use of kvm (by default it is enabled if target_arch == build_arch or both of them are x86 archs) # TESTIMAGE_BOOT_PATTERNS can be used to override certain patterns used to communicate with the target when booting, # if a pattern is not specifically present on this variable a default will be used when booting the target. @@ -75,6 +76,7 @@ DEFAULT_TEST_SUITES:remove:qemumips64 = "${MIPSREMOVE}" TEST_SUITES ?= "${DEFAULT_TEST_SUITES}" +QEMU_USE_KVM ?= "1" TEST_QEMUBOOT_TIMEOUT ?= "1000" TEST_OVERALL_TIMEOUT ?= "" TEST_TARGET ?= "qemu" From patchwork Sat Nov 27 09:53:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 469 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 4A301C433F5 for ; Sat, 27 Nov 2021 09:54:17 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web09.34436.1638006856011106183 for ; Sat, 27 Nov 2021 01:54:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EJF8FDPy; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id m25-20020a7bcb99000000b0033aa12cdd33so3542521wmi.1 for ; Sat, 27 Nov 2021 01:54:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=skczMgF0xfBIrNm6RWwnr31aAwQf0Ax294O7gxPKWw0=; b=EJF8FDPyXMluo7SlrHiBKXmk3jYQpg0VDqYRYLs3B1iVqpaJmy506WJAEBJ9tPPJb3 PAmsF7IwZFYRagUZ9iPSAO9k0WMF8aOklqWDk0ZA/3yl7mFvugZCTZ9V1shYUA0Sh+Q6 0/gsS4mDZxQERxHOvBkohjo8KlaJpqVXLUyTf6D0VvbJOn6Qn2JqFKA/2og0Q2r7IWzM qUfcK/qy82pDpc1Us7NCBQI6u6+8woIMUKQOzAaLbu9aRUHlFQSgTMQ0t75sfkSEAXfI d6U/mxkM6BI4mjMyOJDwSJNxb3Hf076aiZFdBJrt10Iuswk8+xq62AB0vA4BxE0lKkuR 5SAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=skczMgF0xfBIrNm6RWwnr31aAwQf0Ax294O7gxPKWw0=; b=kmFnbJsDTHt39Gp+ofzXVURFiUe4CW7LOxey4jx4e5c5OXMBN4dQfR805htpM31uKM pDEDiW6lVP9XMwzqsvFE/GIYQh+5uxGowxMGthVl0FvvD5R72078Aj0QwoQb0cqkW7HE B2qUrfdJpcnkdTqs5JKrJsEceFX2u3gGBaGSS1+X3RjEvuCh7JKdCjEoez0DGClczVEA rxVi3jCxobphl8ZfvJ4BirQaYQez7o4jnk5ySGl3Rn2ycSZO4k4Ie88Ng/wRA9nia6/F jaMEQ1uUcC70Q76TMjju6Ge91eBShBGJmYjEOjnzWixFamYMtr385uewhOoe+q/sa+kQ W3Xg== X-Gm-Message-State: AOAM532nRxUpWZ29PgWND9f0eBFSKnuEwWr2lFlyqpabkBxHFLn+6Rm4 bQpdEAfSXOz7lhsGl0IItxo/ouBwZL7PYQ== X-Google-Smtp-Source: ABdhPJxApKMb+3hJjDDbxDyBZa/93jh8TBUNp8hSntpsXbmGRkStymqm7J7jqQNOPNKEPNk6xsLBiQ== X-Received: by 2002:a05:600c:202:: with SMTP id 2mr21754109wmi.134.1638006854616; Sat, 27 Nov 2021 01:54:14 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/13] go-helloworld: update to latest revision Date: Sat, 27 Nov 2021 10:53:54 +0100 Message-Id: <20211127095357.1748429-10-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158859 Adjust SRC_URI, github is only a mirror. Adjust GO_IMPORT, as it does not match either github or the official repo. Signed-off-by: Alexander Kanavin --- meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 4e582edcf1..b3a8631794 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://golang.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "git://${GO_IMPORT};branch=master;protocol=https" -SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" +SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" +SRCREV = "787a929d5a0dfb8bbfcdd2c4a62e0fd89466113f" UPSTREAM_CHECK_COMMITS = "1" -GO_IMPORT = "github.com/golang/example" +GO_IMPORT = "golang.org/x/example" GO_INSTALL = "${GO_IMPORT}/hello" GO_WORKDIR = "${GO_INSTALL}" export GO111MODULE="off" From patchwork Sat Nov 27 09:53:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 468 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 5013EC433EF for ; Sat, 27 Nov 2021 09:54:17 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web09.34437.1638006856658938380 for ; Sat, 27 Nov 2021 01:54:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AIh8i9Wq; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id j3so24087154wrp.1 for ; Sat, 27 Nov 2021 01:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zVPL17f4XzN2HuR9hOmX/lND8AOqnB6c3WPdf+U5NyA=; b=AIh8i9WqqlPj5CuQlzN+cOlvFydXsTu8ElawoNqtersQaHlwTgd3CBpoGQVdEfvJVk pxcFwhqAmXvsTae7YCkbFBfrxs6kmM38GCk+vFD1+qXJopDjkFzQ7xxZm11EDDeLyEBh MOiC6v8m4EYT5PSOVaiZChhh6Erchv5zR8ljiXJZVdyv0TqhRCcS1PlXluWy7s520kQG BBcj8gTLnk9RpykS8KRotCpO/vN5k48k3ZoaM4HaxHVNZvK0RlK49VlKadAwa3KxhOXp smZy2giW3bqIFFX2B7ZeGJyrDt10a5F9Q6FVAvXmgepTzQuw2DIWKzM/0RaI9wGLJr87 ffvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zVPL17f4XzN2HuR9hOmX/lND8AOqnB6c3WPdf+U5NyA=; b=4Z0lOXMWseep2LXD53vj7UKxGaJQ98aYKWKRqja6ybZ6MsUhUaIlhly0veiVrkl5XY 76zggAXzWj+MZAu8YvhVROYfL+FpGR4Wa+w8G4uZDQkecmp/L2JQOh3py6RUFYWpm7uv sgT+b3/3bm0DW15sgyQvvDh3cAn1K83bnMBnC+Jo/N97xUTbS6m6JlsywhMm/g0OpnXr hp/KXUNhiXRFSiJ3d/kk3jja30uVpUCVaeEvSod6C40hpJnrsPnG8M6opgpWvLNfhqvP ZrRgJGwKLDcrw7Gm89CUapUR1bJl7czPGbXlfpCASpcgJoQKfD6/xwFIkgkcg+aojizh oJJQ== X-Gm-Message-State: AOAM530vZrImJccVOVH07TiWup47zlVGJKKy4qB2DPsG9H561jLoNJDI 0hIJeM/+xLzdlLTThpeybL34qVTnmFEAqQ== X-Google-Smtp-Source: ABdhPJwp822Tf+WXpWISY947jRunOUM3PPBZ1OyYtXY4/jCuUu627+BQATRQt+B4rQgSs+YglEVynA== X-Received: by 2002:adf:f10f:: with SMTP id r15mr18481899wro.553.1638006855255; Sat, 27 Nov 2021 01:54:15 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/13] go-helloworld: test at runtime Date: Sat, 27 Nov 2021 10:53:55 +0100 Message-Id: <20211127095357.1748429-11-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158860 This adds a smoke check for whether the Go toolchain actually produces working executables across a range of architectures. Signed-off-by: Alexander Kanavin --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/runtime/cases/go.py | 19 +++++++++++++++++++ .../packagegroup-core-tools-testapps.bb | 7 +++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta/lib/oeqa/runtime/cases/go.py diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index e606de25fc..66de0e07c6 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -61,7 +61,7 @@ BASICTESTSUITE = "\ ping date df ssh scp python perl gi ptest parselogs \ logrotate connman systemd oe_syslog pam stap ldd xorg \ kernelmodule gcc buildcpio buildlzip buildgalculator \ - dnf rpm opkg apt weston" + dnf rpm opkg apt weston go" DEFAULT_TEST_SUITES = "${BASICTESTSUITE}" diff --git a/meta/lib/oeqa/runtime/cases/go.py b/meta/lib/oeqa/runtime/cases/go.py new file mode 100644 index 0000000000..89ba2c3ecb --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/go.py @@ -0,0 +1,19 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.runtime.decorator.package import OEHasPackage + +class GoHelloworldTest(OERuntimeTestCase): + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['go-helloworld']) + def test_gohelloworld(self): + cmd = "go-helloworld" + status, output = self.target.run(cmd) + msg = 'Exit status was not 0. Output: %s' % output + self.assertEqual(status, 0, msg=msg) + + msg = 'Incorrect output: %s' % output + self.assertEqual(output, "Hello, Go examples!", msg=msg) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 94405fd8fe..e8f0811485 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -18,6 +18,12 @@ KEXECTOOLS:nios2 ?= "" KEXECTOOLS:riscv64 ?= "" KEXECTOOLS:riscv32 ?= "" +# go does not support ppc32, only ppc64 +# https://github.com/golang/go/issues/22885 +# gccgo may do better +GOTOOLS ?= "go-helloworld" +GOTOOLS:powerpc ?= "" + GSTEXAMPLES ?= "gst-examples" GSTEXAMPLES:riscv64 = "" @@ -49,4 +55,5 @@ RDEPENDS:${PN} = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ + ${GOTOOLS} \ " From patchwork Sat Nov 27 09:53:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 471 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 5AC27C433EF for ; Sat, 27 Nov 2021 09:54:19 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.34226.1638006857694999458 for ; Sat, 27 Nov 2021 01:54:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UHUwmlZi; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id az34-20020a05600c602200b0033bf8662572so8380749wmb.0 for ; Sat, 27 Nov 2021 01:54:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q3tIgQnSJsh2T46eAYH/XEvktZLPX0ZbW4niL0cQ4Gc=; b=UHUwmlZiWEC/alPgn9dVxLdZOmjvK38NiI2ZYLc1/FyZCD1NmR5Tw1HzuY/jgby8kF 93FyVCAS6JkXJvnRK3Pmxr0f7+iIyRd5QLH54/pg8dDw5/8jYaPsrSdPT4FLo5HU9QyA xu5LiwZWHA1eMqlISW3+miXnRxsCBKXrxxAEvM9afARWJw31sHh+0f2UNSM+H1kyCKzP DWtbQTGYLRQKiD3emY0+n2s1aSeul2gBDdkGAZusJWpLuBR8uDiBD9w/GqHbCINvHGW+ l1WNBh+uPVsXTMjBTlHbRIRKss6J8dPY1HaJ3NuhBtVyuruUNiiV652W3d0ZdIxLnKpH zNqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q3tIgQnSJsh2T46eAYH/XEvktZLPX0ZbW4niL0cQ4Gc=; b=gEmRya+Px2pVwbFM/YOnDz7g2h+pMzOApTNWVzMTZ/z5POihY4XWcoE0uPyhQZQtjw CGzIZ46MW9K4KbViPtvXx9+rtjlkZHP0tAXggloo8QRn2Q9CPMq7TE8/UuB/lquOPHA7 DRsWlwsmUcOnPKssKslJsYgJySm4tugq3hdyqGWtRFaaBnEn2NM7u77sN8/K/KpGaQaq a0WozcyX9C4oZ4Aci1kr0yMmotdBarQJPBybRzoe9EeanDkevx//QqO8lHFwQL5O9Zvz rb9dtNWmiL722bmj36NhYpqP0lxl6C3M98OxkmBbEs9X4LRO633ZtHRwBB4j69oJAAUA Ihow== X-Gm-Message-State: AOAM531djqC+gRcGYm3xPjbMP4BsChqQylff8SQHt/NQtaa468Kcmk3m Wo0F4rzGlxik55OFIbuMLB5XI383GR9ypA== X-Google-Smtp-Source: ABdhPJxQkF4IjF+WVCTMYKFlDREJC8mXVXN4Xjz79WZdRhBQVCZWF/2Q7VqwvgYmPMrFNz9cHYS+Xw== X-Received: by 2002:a1c:5409:: with SMTP id i9mr20852520wmb.146.1638006855995; Sat, 27 Nov 2021 01:54:15 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/13] go: update 1.16.10 -> 1.17.3 Date: Sat, 27 Nov 2021 10:53:56 +0100 Message-Id: <20211127095357.1748429-12-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158861 This was additionally verified with meta-virtualization: $ bitbake packagegroup-container packagegroup-kubernetes $ bitbake container-base kvm-image-minimal xen-guest-image-minimal Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.16.10.inc => go-1.17.3.inc} | 6 +- ...ow-CC-and-CXX-to-have-multiple-words.patch | 0 ...ent-based-hash-generation-less-pedan.patch | 64 ++++++++++++------- ...-to-be-overridden-in-the-environment.patch | 15 +++-- ...4-ld-add-soname-to-shareable-objects.patch | 0 ...de-CC-when-building-dist-and-go_boot.patch | 16 +++-- ...dist-separate-host-and-target-builds.patch | 61 ++++++++++-------- ...d-go-make-GOROOT-precious-by-default.patch | 0 ...008-use-GOBUILDMODE-to-set-buildmode.patch | 0 ...go-make-sure-CC-and-CXX-are-absolute.patch | 27 ++++---- ..._1.16.10.bb => go-binary-native_1.17.3.bb} | 4 +- ...1.16.10.bb => go-cross-canadian_1.17.3.bb} | 0 ...go-cross_1.16.10.bb => go-cross_1.17.3.bb} | 0 ...sssdk_1.16.10.bb => go-crosssdk_1.17.3.bb} | 0 ...-native_1.16.10.bb => go-native_1.17.3.bb} | 0 ...untime_1.16.10.bb => go-runtime_1.17.3.bb} | 0 .../go/{go_1.16.10.bb => go_1.17.3.bb} | 0 18 files changed, 113 insertions(+), 82 deletions(-) rename meta/recipes-devtools/go/{go-1.16.10.inc => go-1.17.3.inc} (82%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (100%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (80%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (76%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0004-ld-add-soname-to-shareable-objects.patch (100%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (72%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0006-cmd-dist-separate-host-and-target-builds.patch (89%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0007-cmd-go-make-GOROOT-precious-by-default.patch (100%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0008-use-GOBUILDMODE-to-set-buildmode.patch (100%) rename meta/recipes-devtools/go/{go-1.16 => go-1.17}/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch (83%) rename meta/recipes-devtools/go/{go-binary-native_1.16.10.bb => go-binary-native_1.17.3.bb} (83%) rename meta/recipes-devtools/go/{go-cross-canadian_1.16.10.bb => go-cross-canadian_1.17.3.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.16.10.bb => go-cross_1.17.3.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.16.10.bb => go-crosssdk_1.17.3.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.16.10.bb => go-native_1.17.3.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.16.10.bb => go-runtime_1.17.3.bb} (100%) rename meta/recipes-devtools/go/{go_1.16.10.bb => go_1.17.3.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index d5167ee9ad..946dec74b6 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "11.%" GLIBCVERSION ?= "2.34" LINUXLIBCVERSION ?= "5.15%" QEMUVERSION ?= "6.1%" -GOVERSION ?= "1.16%" +GOVERSION ?= "1.17%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "12.0.1" diff --git a/meta/recipes-devtools/go/go-1.16.10.inc b/meta/recipes-devtools/go/go-1.17.3.inc similarity index 82% rename from meta/recipes-devtools/go/go-1.16.10.inc rename to meta/recipes-devtools/go/go-1.17.3.inc index 7549ffc211..4fe091787b 100644 --- a/meta/recipes-devtools/go/go-1.16.10.inc +++ b/meta/recipes-devtools/go/go-1.17.3.inc @@ -1,8 +1,6 @@ require go-common.inc -GO_BASEVERSION = "1.16" -PV = "1.16.10" -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-1.17:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -17,7 +15,7 @@ SRC_URI += "\ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ " -SRC_URI[main.sha256sum] = "a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5" +SRC_URI[main.sha256sum] = "705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0" # Upstream don't believe it is a signifiant real world issue and will only # fix in 1.17 onwards where we can drop this. diff --git a/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.17/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 100% rename from meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.17/0001-allow-CC-and-CXX-to-have-multiple-words.patch diff --git a/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 80% rename from meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 04d0e496c0..42cd568ef9 100644 --- a/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -1,7 +1,7 @@ -From a13ae484e41139094505d2834437e9262a5315f7 Mon Sep 17 00:00:00 2001 +From c403b45995c5daa6747ac4d95b39bc9a6feb2cda Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:14:22 +0430 -Subject: [PATCH 2/9] cmd/go: make content-based hash generation less pedantic +Subject: [PATCH] cmd/go: make content-based hash generation less pedantic Upstream-Status: Inappropriate [OE specific] @@ -50,9 +50,11 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) +diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go +index 20d0587..ff6f0d8 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -157,7 +157,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -160,7 +160,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -61,9 +63,11 @@ Signed-off-by: Alexander J Kube if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index 5a225fb..a37872e 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -37,6 +37,8 @@ import ( +@@ -38,6 +38,8 @@ import ( "cmd/go/internal/trace" ) @@ -72,7 +76,7 @@ Signed-off-by: Alexander J Kube // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -228,7 +230,7 @@ func (b *Builder) buildActionID(a *Actio +@@ -229,7 +231,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { // Assume b.WorkDir is being trimmed properly. // When -trimpath is used with a package built from the module cache, // use the module path and version instead of the directory. @@ -81,25 +85,36 @@ Signed-off-by: Alexander J Kube fmt.Fprintf(h, "dir %s\n", p.Dir) } else if cfg.BuildTrimpath && p.Module != nil { fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) -@@ -247,13 +249,13 @@ func (b *Builder) buildActionID(a *Actio +@@ -248,9 +250,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { } - if len(p.CgoFiles)+len(p.SwigFiles) > 0 { + if len(p.CgoFiles)+len(p.SwigFiles)+len(p.SwigCXXFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) - cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p) -- fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(), cppflags, cflags, ldflags) + cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true) -+ fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(true), cppflags, cflags, ldflags) - if len(p.CXXFiles)+len(p.SwigFiles) > 0 { -- fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(), cxxflags) -+ fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(true), cxxflags) + +- ccExe := b.ccExe() ++ ccExe := b.ccExe(true) + fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags) + // Include the C compiler tool ID so that if the C + // compiler changes we rebuild the package. +@@ -263,14 +265,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } } - if len(p.FFiles) > 0 { -- fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(), fflags) -+ fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(true), fflags) + if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 { +- cxxExe := b.cxxExe() ++ cxxExe := b.cxxExe(true) + fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags) + if cxxID, err := b.gccToolID(cxxExe[0], "c++"); err == nil { + fmt.Fprintf(h, "CXX ID=%q\n", cxxID) + } } - // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? - } -@@ -2401,33 +2403,48 @@ var ( + if len(p.FFiles) > 0 { +- fcExe := b.fcExe() ++ fcExe := b.fcExe(true) + fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags) + if fcID, err := b.gccToolID(fcExe[0], "f95"); err == nil { + fmt.Fprintf(h, "FC ID=%q\n", fcID) +@@ -2438,33 +2440,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -157,7 +172,7 @@ Signed-off-by: Alexander J Kube } // compilerExe returns the compiler to use given an -@@ -2436,11 +2453,16 @@ func (b *Builder) fcExe() []string { +@@ -2473,11 +2490,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -175,7 +190,7 @@ Signed-off-by: Alexander J Kube return compiler } -@@ -2620,7 +2642,7 @@ func envList(key, def string) []string { +@@ -2667,7 +2689,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -184,7 +199,7 @@ Signed-off-by: Alexander J Kube defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2639,6 +2661,14 @@ func (b *Builder) CFlags(p *load.Package +@@ -2686,6 +2708,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l return } @@ -199,7 +214,7 @@ Signed-off-by: Alexander J Kube return } -@@ -2653,7 +2683,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2700,7 +2730,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -208,7 +223,7 @@ Signed-off-by: Alexander J Kube if err != nil { return nil, nil, err } -@@ -3104,7 +3134,7 @@ func (b *Builder) swigIntSize(objdir str +@@ -3151,7 +3181,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -217,3 +232,6 @@ Signed-off-by: Alexander J Kube if err != nil { return "", "", err } +-- +2.20.1 + diff --git a/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 76% rename from meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 662c705471..2a86bdccf3 100644 --- a/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -1,7 +1,7 @@ -From 28ada8896b76d620240bafc22aa395071d601482 Mon Sep 17 00:00:00 2001 +From 8512964c0bfdfc3c9c3805743ea7de551a1d476a Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:15:37 +0430 -Subject: [PATCH 3/9] cmd/go: Allow GOTOOLDIR to be overridden in the environment +Subject: [PATCH] cmd/go: Allow GOTOOLDIR to be overridden in the environment to allow for split host/target build roots @@ -12,15 +12,18 @@ Matt Madison . Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube + --- src/cmd/dist/build.go | 4 +++- src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) +diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go +index bec1769..d82f612 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -246,7 +246,9 @@ func xinit() { - workdir = xworkdir() +@@ -248,7 +248,9 @@ func xinit() { + } xatexit(rmworkdir) - tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) @@ -30,9 +33,11 @@ Signed-off-by: Alexander J Kube } // compilerEnv returns a map from "goos/goarch" to the +diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go +index 57a3c1f..825d8c7 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -64,7 +64,11 @@ func defaultContext() build.Context { +@@ -67,7 +67,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. diff --git a/meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.17/0004-ld-add-soname-to-shareable-objects.patch similarity index 100% rename from meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.17/0004-ld-add-soname-to-shareable-objects.patch diff --git a/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 72% rename from meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 59c12d9546..2845d21382 100644 --- a/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -1,8 +1,7 @@ -From f05ef3ded52b98537c10efd0b15cd9612471524d Mon Sep 17 00:00:00 2001 +From 153e2dda6103fd9dd871be4bb495a8da5328301e Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:17:16 +0430 -Subject: [PATCH 5/9] make.bash: override CC when building dist and - go_bootstrap +Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap for handling OE cross-canadian builds. @@ -13,13 +12,16 @@ Matt Madison . Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube + --- src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/make.bash b/src/make.bash +index 7986125..dd67029 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; +@@ -181,7 +181,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then exit 1 fi rm -f cmd/dist/dist @@ -28,12 +30,12 @@ Signed-off-by: Alexander J Kube # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -209,7 +209,7 @@ fi +@@ -206,7 +206,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. --./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" -+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" +-./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" ++CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. diff --git a/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 89% rename from meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch index 7aee0bac43..68e8efc1d2 100644 --- a/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch @@ -1,7 +1,7 @@ -From 10735bb84df17ba657f76835f483cd8543a879c1 Mon Sep 17 00:00:00 2001 +From 7bc891e00be4263311d75aa2b2ee6a3b7b75355f Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:18:12 +0430 -Subject: [PATCH 6/9] cmd/dist: separate host and target builds +Subject: [PATCH] cmd/dist: separate host and target builds Upstream-Status: Inappropriate [OE specific] @@ -34,21 +34,24 @@ the meta/recipes-devtools/go tree by Matt Madison . Signed-off-by: Alexander J Kube + --- - src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ - 1 file changed, 112 insertions(+), 43 deletions(-) + src/cmd/dist/build.go | 156 ++++++++++++++++++++++++++++++------------ + 1 file changed, 113 insertions(+), 43 deletions(-) +diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go +index d82f612..5c8459c 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -41,6 +41,7 @@ var ( - goldflags string +@@ -43,6 +43,7 @@ var ( + goexperiment string workdir string tooldir string + build_tooldir string oldgoos string oldgoarch string exe string -@@ -53,6 +54,7 @@ var ( +@@ -55,6 +56,7 @@ var ( rebuildall bool defaultclang bool @@ -56,7 +59,7 @@ Signed-off-by: Alexander J Kube vflag int // verbosity ) -@@ -249,6 +251,8 @@ func xinit() { +@@ -251,6 +253,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -65,7 +68,7 @@ Signed-off-by: Alexander J Kube } // compilerEnv returns a map from "goos/goarch" to the -@@ -480,8 +484,10 @@ func setup() { +@@ -496,8 +500,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -76,9 +79,9 @@ Signed-off-by: Alexander J Kube if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1244,12 +1250,29 @@ func cmdbootstrap() { +@@ -1267,17 +1273,35 @@ func cmdbootstrap() { - var noBanner bool + var noBanner, noClean bool var debug bool + var hostOnly bool + var targetOnly bool @@ -87,12 +90,17 @@ Signed-off-by: Alexander J Kube flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all") flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process") flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner") + flag.BoolVar(&noClean, "no-clean", noClean, "print deprecation warning") + flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target") + flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host") - xflagparse(0) + xflagparse(-1) + if noClean { + xprintf("warning: --no-clean is deprecated and has no effect; use 'go install std cmd' instead\n") + } + + if hostOnly && targetOnly { + fatalf("specify only one of --host-only or --target-only\n") + } @@ -104,10 +112,11 @@ Signed-off-by: Alexander J Kube + fatalf("package names not permitted without --host-only or --target-only\n") + } + } ++ // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1303,8 +1326,13 @@ func cmdbootstrap() { +@@ -1345,8 +1369,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -123,7 +132,7 @@ Signed-off-by: Alexander J Kube goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1333,7 +1361,11 @@ func cmdbootstrap() { +@@ -1375,7 +1404,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -133,10 +142,10 @@ Signed-off-by: Alexander J Kube + } else { + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + } + // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT. + os.Setenv("GOEXPERIMENT", goexperiment) goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) - if debug { - run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1370,50 +1402,84 @@ func cmdbootstrap() { +@@ -1414,50 +1447,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -188,6 +197,8 @@ Signed-off-by: Alexander J Kube - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") +- } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -219,8 +230,7 @@ Signed-off-by: Alexander J Kube + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) - } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) ++ } goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -228,7 +238,12 @@ Signed-off-by: Alexander J Kube - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -- } ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) + } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -249,16 +264,10 @@ Signed-off-by: Alexander J Kube - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) -+ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1430,8 +1496,11 @@ func cmdbootstrap() { +@@ -1474,8 +1541,11 @@ func cmdbootstrap() { } } diff --git a/meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.17/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 100% rename from meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.17/0007-cmd-go-make-GOROOT-precious-by-default.patch diff --git a/meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.17/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 100% rename from meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.17/0008-use-GOBUILDMODE-to-set-buildmode.patch diff --git a/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch b/meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch rename to meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch index dcbdf58752..f857b72234 100644 --- a/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch +++ b/meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch @@ -1,4 +1,4 @@ -From a983bc6cd48fb0da939e3329cac18d7a3b29ecf8 Mon Sep 17 00:00:00 2001 +From 66a45dae3af140662e17ef85c2e6fe40270a2553 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 22 Feb 2021 17:54:01 -0800 Subject: [PATCH] Revert "cmd/go: make sure CC and CXX are absolute" @@ -17,20 +17,20 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj --- src/cmd/go/internal/envcmd/env.go | 5 ----- - src/cmd/go/internal/work/init.go | 7 ------- + src/cmd/go/internal/work/init.go | 6 ------ src/cmd/go/testdata/script/env_write.txt | 24 ------------------------ - 3 files changed, 36 deletions(-) + 3 files changed, 35 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 6937187522..29f9057c3f 100644 +index ff6f0d8..43b94e7 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -427,11 +427,6 @@ func checkEnvWrite(key, val string) error { +@@ -457,11 +457,6 @@ func checkEnvWrite(key, val string) error { if !filepath.IsAbs(val) && val != "" { return fmt.Errorf("GOPATH entry is relative; must be absolute path: %q", val) } - // Make sure CC and CXX are absolute paths -- case "CC", "CXX": +- case "CC", "CXX", "GOMODCACHE": - if !filepath.IsAbs(val) && val != "" && val != filepath.Base(val) { - return fmt.Errorf("%s entry is relative; must be absolute path: %q", key, val) - } @@ -38,10 +38,10 @@ index 6937187522..29f9057c3f 100644 if !utf8.ValidString(val) { diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go -index ba7c7c2fbb..3a6df5f758 100644 +index 37a3e2d..316b0cf 100644 --- a/src/cmd/go/internal/work/init.go +++ b/src/cmd/go/internal/work/init.go -@@ -41,13 +41,6 @@ func BuildInit() { +@@ -39,12 +39,6 @@ func BuildInit() { cfg.BuildPkgdir = p } @@ -51,12 +51,11 @@ index ba7c7c2fbb..3a6df5f758 100644 - base.Fatalf("go %s: %s environment variable is relative; must be absolute path: %s\n", flag.Args()[0], key, path) - } - } -- - // For each experiment that has been enabled in the toolchain, define a - // build tag with the same name but prefixed by "goexperiment." which can be - // used for compiling alternative files for the experiment. This allows + } + + func instrumentInit() { diff --git a/src/cmd/go/testdata/script/env_write.txt b/src/cmd/go/testdata/script/env_write.txt -index bda1e57826..c99aadb7f2 100644 +index b5e9739..566c876 100644 --- a/src/cmd/go/testdata/script/env_write.txt +++ b/src/cmd/go/testdata/script/env_write.txt @@ -129,30 +129,6 @@ go env -w GOTMPDIR= @@ -91,5 +90,5 @@ index bda1e57826..c99aadb7f2 100644 env GOOS= env GOARCH= -- -2.30.1 +2.20.1 diff --git a/meta/recipes-devtools/go/go-binary-native_1.16.10.bb b/meta/recipes-devtools/go/go-binary-native_1.17.3.bb similarity index 83% rename from meta/recipes-devtools/go/go-binary-native_1.16.10.bb rename to meta/recipes-devtools/go/go-binary-native_1.17.3.bb index 4866c9f847..1b43a804da 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.16.10.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.17.3.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "414cd18ce1d193769b9e97d2401ad718755ab47816e13b2a1cde203d263b55cf" -SRC_URI[go_linux_arm64.sha256sum] = "bfe1d4b82626c742b4690a832ca59a21e3d702161556f3c0ed26dffb368927e9" +SRC_URI[go_linux_amd64.sha256sum] = "550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c" +SRC_URI[go_linux_arm64.sha256sum] = "06f505c8d27203f78706ad04e47050b49092f1b06dc9ac4fbee4f0e4d015c8d4" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.16.10.bb b/meta/recipes-devtools/go/go-cross-canadian_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.16.10.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.17.3.bb diff --git a/meta/recipes-devtools/go/go-cross_1.16.10.bb b/meta/recipes-devtools/go/go-cross_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.16.10.bb rename to meta/recipes-devtools/go/go-cross_1.17.3.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.16.10.bb b/meta/recipes-devtools/go/go-crosssdk_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.16.10.bb rename to meta/recipes-devtools/go/go-crosssdk_1.17.3.bb diff --git a/meta/recipes-devtools/go/go-native_1.16.10.bb b/meta/recipes-devtools/go/go-native_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.16.10.bb rename to meta/recipes-devtools/go/go-native_1.17.3.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.16.10.bb b/meta/recipes-devtools/go/go-runtime_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.16.10.bb rename to meta/recipes-devtools/go/go-runtime_1.17.3.bb diff --git a/meta/recipes-devtools/go/go_1.16.10.bb b/meta/recipes-devtools/go/go_1.17.3.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.16.10.bb rename to meta/recipes-devtools/go/go_1.17.3.bb From patchwork Sat Nov 27 09:53:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 470 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 58622C433FE for ; Sat, 27 Nov 2021 09:54:19 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.34590.1638006858015894448 for ; Sat, 27 Nov 2021 01:54:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NSvjR046; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id v11so24010063wrw.10 for ; Sat, 27 Nov 2021 01:54:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2/BQi2OPaS8Oj+g3yIorPRAJQuKpM5Q5nvHPZ8Kn1Mk=; b=NSvjR046uALNxQYvyqw0mzgwlcIbmQ88H5XA6VBV0Lsgh9XZbbhya3YKuzk9soqHrP wtinF+p4YEs4eGyKpbkd0RNhgVZuJHwUhL05AZaHLrKgWer/ByC3EYISsamo7AhgLsvY kF92L4HuAB65YTafPDMeixW/gpVgO1yHKNwOBYY0UZzgkdgNY33WSgFJrGFrrGbrD7Yv sJlV4HVZzkb6x1YnbQKUWezHpdTPa3imukqkZQWCQpl+WCVUfZKiH1695K6tGPq8kPmi EHwKBhlw6XQaE/T6igVnEGq353NVrfATku05XSPYOTFzUXukQ0gDlNTCCgFTY1N9W45G 7Q0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2/BQi2OPaS8Oj+g3yIorPRAJQuKpM5Q5nvHPZ8Kn1Mk=; b=GWGpXiBOLKHh3XOAkqSdHULeGaCcmyIDzylzyCx9V+NYOv7LgEwi5e78VOgvw4COVG CkiKHdJZVnN1KZJIlozLGDEwO3KSx2rhso6HWb8kNtyxexiue3Tpg5+rkjYYNcr269Kq ApuCOF6ccDLIc9lRrItfmyhE5qn632hqkHV/m2HLTT3FIcqBk6JHVwM/QzSLTzUAkrSR HJwi0Ktn4P5SqDIbj+XQARBbZ4RP1a4Jf0fW/pZP+VSPVqoBbV7qa7dnfXC5uVzORt/1 u5LziBqJXAzT+sxZCC41HEpZOQBZj/Xw9+Wt7qzj0AVC36YytliGw50SxVHNegEgEpfk YyCA== X-Gm-Message-State: AOAM5304PXx2C1S3JSl9TFTLpt8ZWatture+bq36no2Nnj2j5aIER2Sl eq2FwfpeezgqFxV6lQR2uhIeZTOei5K17g== X-Google-Smtp-Source: ABdhPJxQsS5DdM4i1ROtIw7JwyV5O3b2CqWD5zVljUxPGmlYzDUXarMZjt71wKCTNDnEitjFAFKdOg== X-Received: by 2002:a5d:6449:: with SMTP id d9mr19646835wrw.332.1638006856643; Sat, 27 Nov 2021 01:54:16 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id w4sm8484302wrs.88.2021.11.27.01.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Nov 2021 01:54:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/13] python3-rfc3339/3986-validator: correct upstream version check Date: Sat, 27 Nov 2021 10:53:57 +0100 Message-Id: <20211127095357.1748429-13-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211127095357.1748429-1-alex@linutronix.de> References: <20211127095357.1748429-1-alex@linutronix.de> 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 ; Sat, 27 Nov 2021 09:54:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158862 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb | 1 + meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb b/meta/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb index 7f1bbaf97d..9bc5fed921 100644 --- a/meta/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb +++ b/meta/recipes-devtools/python/python3-rfc3339-validator_0.1.4.bb @@ -8,6 +8,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/python-rfc3339-validator:" SRC_URI[sha256sum] = "138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b" PYPI_PACKAGE = "rfc3339_validator" +UPSTREAM_CHECK_REGEX = "/rfc3339-validator/(?P(\d+[\.\-_]*)+)/" inherit pypi setuptools3 diff --git a/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb index 68b3db1f48..4abd181acf 100644 --- a/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb +++ b/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb @@ -9,6 +9,7 @@ SRC_URI[md5sum] = "47f7657b790aaf6011a1ab3d86c6be95" SRC_URI[sha256sum] = "3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055" PYPI_PACKAGE = "rfc3986_validator" +UPSTREAM_CHECK_REGEX = "/rfc3986-validator/(?P(\d+[\.\-_]*)+)/" inherit pypi setuptools3