summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2024-04-04 11:16:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-04 21:50:24 +0100
commit8969055428fc974bb05944c8af37fa636830cfe3 (patch)
treeef29445e17d56194848d03892935216f141dd91d /meta/recipes-devtools
parentad81041a336a89abf3db495bb3dabe32dd4bc02f (diff)
downloadpoky-8969055428fc974bb05944c8af37fa636830cfe3.tar.gz
go: keep the patches in order
drop the old version no more used 0007-exec.go-do-not-write-linker-flags-into-buildids.patch that was replaced by the 0001-exec.go-filter-out-build-specific-paths-from-linker-.patch renamed now to 0007-exec.go-filter-out-build-specific-paths-from-linker-.patch (From OE-Core rev: 81b35091e4561b96212a1eedf0e579a8c3aa2b7d) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/go/go-1.22.1.inc2
-rw-r--r--meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch43
-rw-r--r--meta/recipes-devtools/go/go/0007-exec.go-filter-out-build-specific-paths-from-linker-.patch (renamed from meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch)0
3 files changed, 1 insertions, 44 deletions
diff --git a/meta/recipes-devtools/go/go-1.22.1.inc b/meta/recipes-devtools/go/go-1.22.1.inc
index 4330853450..f1cf4beebb 100644
--- a/meta/recipes-devtools/go/go-1.22.1.inc
+++ b/meta/recipes-devtools/go/go-1.22.1.inc
@@ -11,8 +11,8 @@ SRC_URI += "\
11 file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ 11 file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \
12 file://0005-cmd-dist-separate-host-and-target-builds.patch \ 12 file://0005-cmd-dist-separate-host-and-target-builds.patch \
13 file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ 13 file://0006-cmd-go-make-GOROOT-precious-by-default.patch \
14 file://0007-exec.go-filter-out-build-specific-paths-from-linker-.patch \
14 file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ 15 file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
15 file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ 16 file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
16 file://0001-exec.go-filter-out-build-specific-paths-from-linker-.patch \
17" 17"
18SRC_URI[main.sha256sum] = "79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321" 18SRC_URI[main.sha256sum] = "79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321"
diff --git a/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch b/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch
deleted file mode 100644
index 35f3a98d80..0000000000
--- a/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 619991feab04f331d081a91243434ccd859f611d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 23 Nov 2020 19:22:04 +0000
4Subject: [PATCH 7/9] exec.go: do not write linker flags into buildids
5
6The flags can contain build-specific paths, breaking reproducibility.
7
8To make this acceptable to upstream, we probably need to trim the flags,
9removing those known to be buildhost-specific.
10
11Upstream-Status: Inappropriate [needs upstream discussion]
12
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
15---
16 src/cmd/go/internal/work/exec.go | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
20index 544df461a2..75df5a4aa8 100644
21--- a/src/cmd/go/internal/work/exec.go
22+++ b/src/cmd/go/internal/work/exec.go
23@@ -1374,7 +1374,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID {
24 }
25
26 // Toolchain-dependent configuration, shared with b.linkSharedActionID.
27- b.printLinkerConfig(h, p)
28+ //b.printLinkerConfig(h, p)
29
30 // Input files.
31 for _, a1 := range a.Deps {
32@@ -1720,7 +1720,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID {
33 fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch)
34
35 // Toolchain-dependent configuration, shared with b.linkActionID.
36- b.printLinkerConfig(h, nil)
37+ //b.printLinkerConfig(h, nil)
38
39 // Input files.
40 for _, a1 := range a.Deps {
41--
422.44.0
43
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/0007-exec.go-filter-out-build-specific-paths-from-linker-.patch
index c5bf28f54a..c5bf28f54a 100644
--- a/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch
+++ b/meta/recipes-devtools/go/go/0007-exec.go-filter-out-build-specific-paths-from-linker-.patch