From ca0d5e4dcff413a4898100762ee750b96ac4e53d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Apr 2026 16:33:02 +0000 Subject: [PATCH] fix(autopatch): auto-fix for golang on c10 Removed 6 obsolete race-detection actions (already applied upstream in c10 spec) from config.yaml, keeping only the 3 x86_64_v2/GOAMD64 actions that still need to be applied. --- config.yaml | 126 +--------------------------------------------------- 1 file changed, 2 insertions(+), 124 deletions(-) diff --git a/config.yaml b/config.yaml index 5900033..c540f54 100644 --- a/config.yaml +++ b/config.yaml @@ -8,130 +8,8 @@ actions: sed -i 's/^GOAMD64=v3$/GOAMD64=v2/' ./go.env grep -q '^GOAMD64=v2$' ./go.env %endif - - %build - count: 1 - - target: "spec" - find: | - %ifarch aarch64 - %bcond_without ignore_tests - %else - %bcond_with ignore_tests - %endif - replace: | - %ifarch aarch64 - %bcond_without ignore_tests - %else - %bcond_with ignore_tests - %endif - - %global race 1 - %ifarch riscv64 - %global race 0 - %endif - count: 1 - - target: "spec" - find: | - %package race - Summary: Race detetector library object files. - Requires: %{name} = %{version}-%{release} - - %description race - Binary library objects for Go's race detector. - replace: | - %if %{race} - %package race - Summary: Race detetector library object files. - Requires: %{name} = %{version}-%{release} - %description race - Binary library objects for Go's race detector. - %endif - count: 1 - find: | - %ifarch x86_64 - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso - - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso - - %else - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_%{gohostarch}.syso ./src/runtime/race/race_linux_%{gohostarch}.syso - %endif - replace: | - %if %{race} - %ifarch x86_64 - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso - - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso - - %else - pushd "${tsan_go_dir}" - CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang ./buildgo.sh - popd - cp "${tsan_go_dir}"/race_linux_%{gohostarch}.syso ./src/runtime/race/race_linux_%{gohostarch}.syso - %endif - %endif - count: 1 - - target: "spec" - find: | - GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race std - replace: | - %if %{race} - GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race std - %endif - count: 1 - - target: "spec" - find: | - %ifarch x86_64 - %exclude %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso - %exclude %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso - %else - %exclude %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso - %endif - replace: | - %if %{race} - %ifarch x86_64 - %exclude %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso - %exclude %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso - %else - %exclude %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso - %endif - %endif - count: 1 - - target: "spec" - find: | - %files race - %ifarch x86_64 - %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso - %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso - %else - %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso - %endif - replace: | - %if %{race} - %files race - %ifarch x86_64 - %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso - %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso - %else - %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso - %endif - %endif + %build count: 1 - target: "spec" find: | @@ -153,7 +31,7 @@ actions: export GOAMD64=v3 %endif count: -1 - + - modify_release: - suffix: ".alma.1"