diff --git a/.gitignore b/.gitignore index 461702f..de4218f 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ /go1.21.6.src.tar.gz /go1.22rc1.src.tar.gz /go1.22rc2.src.tar.gz +/go1.22.0.src.tar.gz diff --git a/0005-Skip-TestCrashDumpsAllThreads.patch b/0005-Skip-TestCrashDumpsAllThreads.patch new file mode 100644 index 0000000..34a84b3 --- /dev/null +++ b/0005-Skip-TestCrashDumpsAllThreads.patch @@ -0,0 +1,28 @@ +From c0c22e2aa7d1901c97da04f834ce9c7b9e38be80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= +Date: Sun, 11 Feb 2024 12:08:35 +0100 +Subject: [PATCH] Skip TestCrashDumpsAllThreads + +See golang.org/issues/64650 +--- + src/runtime/crash_unix_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go +index 123a462423..a0034d6455 100644 +--- a/src/runtime/crash_unix_test.go ++++ b/src/runtime/crash_unix_test.go +@@ -74,6 +74,10 @@ func TestCrashDumpsAllThreads(t *testing.T) { + t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196") + } + ++ if runtime.GOOS == "linux" && runtime.GOARCH == "s390x" { ++ t.Skip("skipping; frequent TestCrashDumpsAllThreads failures on linux/s390x, see golang.org/issue/64650") ++ } ++ + testenv.MustHaveGoBuild(t) + + if strings.Contains(os.Getenv("GOFLAGS"), "mayMoreStackPreempt") { +-- +2.43.0 + diff --git a/README.packit b/README.packit index 115b422..29cc7d8 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.88.0.post1.dev4+gc070191b. +The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. diff --git a/golang.spec b/golang.spec index 74f4561..0538869 100644 --- a/golang.spec +++ b/golang.spec @@ -96,8 +96,8 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.22 -%global go_prerelease rc2 -#global go_patch 6 +#global go_prerelease rc2 +%global go_patch 0 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -142,12 +142,14 @@ Provides: bundled(golang(golang.org/x/term)) = 0.15.0 Provides: bundled(golang(golang.org/x/text)) = 0.14.0 Provides: bundled(golang(golang.org/x/tools)) = 0.16.2.0.20231218185909.83bceaf2424d + Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} Requires: go-filesystem Patch1: 0001-Modify-go.env.patch Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch +Patch5: 0005-Skip-TestCrashDumpsAllThreads.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 diff --git a/sources b/sources index 97f1841..ddd1e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.22rc2.src.tar.gz) = 4d412c3599519f44a6322dd0148ab0e5b0405f360b0a0b2498951d2968273c9f04700e475c53d1b3e5b88f2308f08be61fcc828eb4ea0408a34e44b75d746e08 +SHA512 (go1.22.0.src.tar.gz) = f47fdac3281463757b3db9f6ab747f86ed7263beed52c820ec2571375a578034df02c0b76912c19fab3a58df3b04d79b6aae084163d1d5847c907aeb30b936e3