From patchwork Fri Mar 15 17:00:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 41022 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 E4FF4C54E7A for ; Fri, 15 Mar 2024 17:00:12 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.1240.1710522011881733326 for ; Fri, 15 Mar 2024 10:00:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=AKAa8V5c; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=3G9wX8Z4; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018e430e8bcc-50c197e9-bea5-4493-8a55-bf1ecb4dd4df-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1710522011; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=OaSCfoAzGcSXHdeMQIxUaUN99HfUf/4QHUW/5qKuKGw=; b=AKAa8V5cN2BB9im/NtvAzKWmlRBffWrHL9bgAeWJ5QmkWJDMDornqegbp5FiYGTF YF8s+9JyjGhH35ZtiDAynMgQaBi5+0FOqow59i1gvmmzjCvUHdyGJE8zo6h5CftB7sq pwByYBMCXD1bFPs+WUK9qFFY12hPe52cHx24wjAI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1710522011; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=OaSCfoAzGcSXHdeMQIxUaUN99HfUf/4QHUW/5qKuKGw=; b=3G9wX8Z4rd8B5yRp7AuyTawRNwPfsnFEPOCzzuMjneMbW0+S59FKnvL5Zt9vWW63 ZgwSgiwnjvnSjwc5f37pr1zhaEKW+CGgQruhuoZ/N4KP83TbWfSDbgkCHwBj7RYYTB8 0ZIbPsgMC6uWar9reuh7jj2tO3ycX4/KVnZOQirY= MIME-Version: 1.0 From: auh@yoctoproject.org To: Khem Raj Cc: openembedded-core@lists.openembedded.org Subject: [AUH] go-runtime: upgrading to 1.22.1 FAILED Message-ID: <0101018e430e8bcc-50c197e9-bea5-4493-8a55-bf1ecb4dd4df-000000@us-west-2.amazonses.com> Date: Fri, 15 Mar 2024 17:00:10 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.03.15-54.240.27.193 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 ; Fri, 15 Mar 2024 17:00:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197167 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *go-runtime* to *1.22.1* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-go-runtime-upgrade-1.22.0-1.22.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 045553a4fa74a0bdd6ed627818b0f0684e44c262 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Mar 2024 06:02:34 +0000 Subject: [PATCH] go-runtime: upgrade 1.22.0 -> 1.22.1 --- .../go/{go-1.22.0.inc => go-1.22.1.inc} | 2 +- .../{go-runtime_1.22.0.bb => go-runtime_1.22.1.bb} | 0 ...e-content-based-hash-generation-less-pedan.patch | 11 ++++------- ...lter-out-build-specific-paths-from-linker-.patch | 11 ++++------- ...ow-GOTOOLDIR-to-be-overridden-in-the-envir.patch | 12 ++++-------- .../0003-ld-add-soname-to-shareable-objects.patch | 9 +++------ ...override-CC-when-building-dist-and-go_boot.patch | 10 +++------- ...5-cmd-dist-separate-host-and-target-builds.patch | 9 +++------ ...006-cmd-go-make-GOROOT-precious-by-default.patch | 13 +++++-------- ...st-buildgo.go-do-not-hardcode-host-compile.patch | 11 ++++------- ...lter-build-paths-on-staticly-linked-arches.patch | 9 +++------ 11 files changed, 34 insertions(+), 63 deletions(-) rename meta/recipes-devtools/go/{go-1.22.0.inc => go-1.22.1.inc} (89%) rename meta/recipes-devtools/go/{go-runtime_1.22.0.bb => go-runtime_1.22.1.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.0.inc b/meta/recipes-devtools/go/go-1.22.1.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.0.inc rename to meta/recipes-devtools/go/go-1.22.1.inc index 5b94051fc2..4330853450 100644 --- a/meta/recipes-devtools/go/go-1.22.0.inc +++ b/meta/recipes-devtools/go/go-1.22.1.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ file://0001-exec.go-filter-out-build-specific-paths-from-linker-.patch \ " -SRC_URI[main.sha256sum] = "4d196c3d41a0d6c1dfc64d04e3cc1f608b0c436bd87b7060ce3e23234e1f4d5c" +SRC_URI[main.sha256sum] = "79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321" diff --git a/meta/recipes-devtools/go/go-runtime_1.22.0.bb b/meta/recipes-devtools/go/go-runtime_1.22.1.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.0.bb rename to meta/recipes-devtools/go/go-runtime_1.22.1.bb diff --git a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch index 564837c7cd..db36f2f726 100644 --- a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -1,7 +1,7 @@ -From 9a6c5040cbcd88b10ceb8ceaebc8d6158c086670 Mon Sep 17 00:00:00 2001 +From c896624aa46760ffcaf2b432f15e4a6a35768115 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 28 Mar 2022 10:59:03 -0700 -Subject: [PATCH 1/9] cmd/go: make content-based hash generation less pedantic +Subject: [PATCH] cmd/go: make content-based hash generation less pedantic Go 1.10's build tool now uses content-based hashes to determine when something should be built or re-built. @@ -32,7 +32,7 @@ Signed-off-by: Jose Quaresma 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index c7c2e83e0f..4a90d9da5c 100644 +index c7c2e83..4a90d9d 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -189,7 +189,7 @@ func ExtraEnvVarsCostly() []cfg.EnvVar { @@ -45,7 +45,7 @@ index c7c2e83e0f..4a90d9da5c 100644 // 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 e05471b06c..9724cd07d0 100644 +index e05471b..9724cd0 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -232,6 +232,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { @@ -163,6 +163,3 @@ index e05471b06c..9724cd07d0 100644 if err != nil { return "", "", err } --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch b/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch index c5bf28f54a..0d9606cd47 100644 --- a/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch +++ b/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch @@ -1,4 +1,4 @@ -From 083b5c74b12a1abeb11dd7f58a1cb1593d0000c0 Mon Sep 17 00:00:00 2001 +From dcd60d2349745e48f9d65d47b9e758231e29f352 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 27 Feb 2024 18:06:51 +0800 Subject: [PATCH] exec.go: filter out build-specific paths from linker flags @@ -14,10 +14,10 @@ Signed-off-by: Changqing Li 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index cde867b..e3ce17d 100644 +index 544df46..c8f297c 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -1358,6 +1358,29 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { +@@ -1401,6 +1401,29 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { return h.Sum() } @@ -47,7 +47,7 @@ index cde867b..e3ce17d 100644 // printLinkerConfig prints the linker config into the hash h, // as part of the computation of a linker-related action ID. func (b *Builder) printLinkerConfig(h io.Writer, p *load.Package) { -@@ -1368,7 +1391,7 @@ func (b *Builder) printLinkerConfig(h io.Writer, p *load.Package) { +@@ -1411,7 +1434,7 @@ func (b *Builder) printLinkerConfig(h io.Writer, p *load.Package) { case "gc": fmt.Fprintf(h, "link %s %q %s\n", b.toolID("link"), forcedLdflags, ldBuildmode) if p != nil { @@ -56,6 +56,3 @@ index cde867b..e3ce17d 100644 } // GOARM, GOMIPS, etc. --- -2.25.1 - diff --git a/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch index 001c94a4e7..f60f3992d2 100644 --- a/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch +++ b/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch @@ -1,8 +1,7 @@ -From e3f9a8a69d3a340c1a1d0bba566e71f20f635a43 Mon Sep 17 00:00:00 2001 +From dffcebec4da5eec22fc1bd7885d604d2dc0a800b Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:15:37 +0430 -Subject: [PATCH 2/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 @@ -20,7 +19,7 @@ Signed-off-by: Jose Quaresma 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 32e59b446a..06ee4de8a9 100644 +index 32e59b4..06ee4de 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -259,7 +259,9 @@ func xinit() { @@ -35,7 +34,7 @@ index 32e59b446a..06ee4de8a9 100644 goversion := findgoversion() isRelease = strings.HasPrefix(goversion, "release.") || strings.HasPrefix(goversion, "go") diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a8daa2dfc3..393ada39c9 100644 +index a8daa2d..393ada3 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -230,7 +230,11 @@ func SetGOROOT(goroot string, isTestGo bool) { @@ -51,6 +50,3 @@ index a8daa2dfc3..393ada39c9 100644 } } } --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch index 9cab2969c8..3a3efbc8d2 100644 --- a/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch @@ -1,7 +1,7 @@ -From 7dde77b3ce8138314dd2736604b1b110dbcc0ac1 Mon Sep 17 00:00:00 2001 +From e56a1a2b4af43a4ce8563829a924831ba1ff1c89 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:16:32 +0430 -Subject: [PATCH 3/9] ld: add soname to shareable objects +Subject: [PATCH] ld: add soname to shareable objects so that OE's shared library dependency handling can find them. @@ -19,7 +19,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 3 insertions(+) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index eab74dc328..ae9bbc9093 100644 +index eab74dc..ae9bbc9 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -1576,6 +1576,7 @@ func (ctxt *Link) hostlink() { @@ -46,6 +46,3 @@ index eab74dc328..ae9bbc9093 100644 } } --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch index 8889aef1cf..566de37933 100644 --- a/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -1,8 +1,7 @@ -From 9f59e46991074d3e3c4d00f3971e62bfcd707167 Mon Sep 17 00:00:00 2001 +From 0b6e3411562fe236f9f01cd070b6c32382dfab39 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:17:16 +0430 -Subject: [PATCH 4/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. @@ -19,7 +18,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/make.bash b/src/make.bash -index 76ad51624a..074e129a24 100755 +index 76ad516..074e129 100755 --- a/src/make.bash +++ b/src/make.bash @@ -198,7 +198,7 @@ if [[ "$GOROOT_BOOTSTRAP" == "$GOROOT" ]]; then @@ -40,6 +39,3 @@ index 76ad51624a..074e129a24 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch index 364fce907a..7fa3f82730 100644 --- a/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch @@ -1,7 +1,7 @@ -From 6dda78d528e60993a4688cd9d49440a726378ac8 Mon Sep 17 00:00:00 2001 +From cb4c5e79f5a5833d746711fc6e12fc21704b2669 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:18:12 +0430 -Subject: [PATCH 5/9] cmd/dist: separate host and target builds +Subject: [PATCH] cmd/dist: separate host and target builds Change the dist tool to allow for OE-style cross- and cross-canadian builds: @@ -45,7 +45,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 06ee4de8a9..74b7c7098f 100644 +index 06ee4de..016b1dd 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -46,6 +46,7 @@ var ( @@ -216,6 +216,3 @@ index 06ee4de8a9..74b7c7098f 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch index 262f1e96b8..0b2773410e 100644 --- a/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch @@ -1,7 +1,7 @@ -From aff5a740d6286c04beb0593fc68b0aea5a95ad39 Mon Sep 17 00:00:00 2001 +From cbb374bcead3e21dbb74c8115f58c42769927063 Mon Sep 17 00:00:00 2001 From: Alex Kube Date: Wed, 23 Oct 2019 21:18:56 +0430 -Subject: [PATCH 6/9] cmd/go: make GOROOT precious by default +Subject: [PATCH] cmd/go: make GOROOT precious by default The go build tool normally rebuilds whatever it detects is stale. This can be a problem when GOROOT is intended to @@ -29,7 +29,7 @@ Signed-off-by: Jose Quaresma 3 files changed, 34 insertions(+) diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index a59072e591..9e35ebde0c 100644 +index a59072e..9e35ebd 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go @@ -754,6 +754,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { @@ -43,7 +43,7 @@ index a59072e591..9e35ebde0c 100644 // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 408edb5119..3d60252127 100644 +index 408edb5..3d60252 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go @@ -233,6 +233,8 @@ See also: go install, go get, go clean. @@ -67,7 +67,7 @@ index 408edb5119..3d60252127 100644 // Note that flags consulted by other parts of the code diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 9724cd07d0..544df461a2 100644 +index 9724cd0..544df46 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -544,6 +544,23 @@ func (b *Builder) build(ctx context.Context, a *Action) (err error) { @@ -109,6 +109,3 @@ index 9724cd07d0..544df461a2 100644 if err := b.Shell(a).Mkdir(a.Objdir); err != nil { return err } --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch b/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch index 0662f66af5..6abf1a1165 100644 --- a/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch +++ b/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch @@ -1,8 +1,8 @@ -From e0999902687e2e394499f7153db8d62440c4dab0 Mon Sep 17 00:00:00 2001 +From f3744a3ee2bcc546d664c1520c0ac6300a17765e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 16:33:27 +0000 -Subject: [PATCH 8/9] src/cmd/dist/buildgo.go: do not hardcode host compilers - into target binaries +Subject: [PATCH] src/cmd/dist/buildgo.go: do not hardcode host compilers into + target binaries These come from $CC/$CXX on the build host and are not useful on targets; additionally as they contain host specific paths, this helps reproducibility. @@ -16,7 +16,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go -index 884e9d729a..2f52edacfe 100644 +index 884e9d7..2f52eda 100644 --- a/src/cmd/dist/buildgo.go +++ b/src/cmd/dist/buildgo.go @@ -51,8 +51,8 @@ func mkzdefaultcc(dir, file string) { @@ -41,6 +41,3 @@ index 884e9d729a..2f52edacfe 100644 writefile(buf.String(), file, writeSkipSame) } --- -2.44.0 - diff --git a/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch index cc45496e9c..4e0f1d3cc0 100644 --- a/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch +++ b/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch @@ -1,7 +1,7 @@ -From 6c2438f187ca912c54a71b4ac65ab98999a019d2 Mon Sep 17 00:00:00 2001 +From 5e32c6edc03f094b3ebf969032cb2eb6b47ba88c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 Jul 2022 23:08:13 +0100 -Subject: [PATCH 9/9] go: Filter build paths on staticly linked arches +Subject: [PATCH] go: Filter build paths on staticly linked arches Filter out build time paths from ldflags and other flags variables when they're embedded in the go binary so that builds are reproducible regardless of build @@ -17,7 +17,7 @@ Signed-off-by: Jose Quaresma 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go -index 1549800afb..f41fb2c4ef 100644 +index 1549800..f41fb2c 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -2277,6 +2277,17 @@ func appendBuildSetting(info *debug.BuildInfo, key, value string) { @@ -56,6 +56,3 @@ index 1549800afb..f41fb2c4ef 100644 } } appendSetting("GOARCH", cfg.BuildContext.GOARCH) --- -2.44.0 -