Update env var for v2
Disable race for riscv64
This commit is contained in:
Eduard Abdullin
root
commit
d4c82c7270
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
compiler-rt-18.1.8.src.tar.xz
|
||||
go1.25.3-1-openssl-fips.tar.gz
|
||||
go1.25.3.src.tar.gz
|
||||
go1.25.5-1-openssl-fips.tar.gz
|
||||
go1.25.5.src.tar.gz
|
||||
|
||||
67
golang.spec
67
golang.spec
@ -5,7 +5,7 @@
|
||||
release_number = 1;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}.alma.2
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}.alma.1
|
||||
## END: Set by rpmautospec
|
||||
|
||||
%bcond_with bootstrap
|
||||
@ -130,7 +130,7 @@
|
||||
%global go_api 1.25
|
||||
# Use only for prerelease versions
|
||||
#global go_prerelease rc3
|
||||
%global go_patch 3
|
||||
%global go_patch 5
|
||||
%global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
|
||||
%global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
|
||||
# Go FIPS package release
|
||||
@ -221,10 +221,8 @@ Provides: bundled(golang(rsc.io/markdown)) = 0.0.0.20240306144322.0bf8f97ee8ef
|
||||
Requires: %{name}-bin = %{version}-%{release}
|
||||
Requires: %{name}-src = %{version}-%{release}
|
||||
%if %{race}
|
||||
%if %{race}
|
||||
Requires: %{name}-race = %{version}-%{release}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Patch1: 0001-Modify-go.env.patch
|
||||
Patch6: 0006-Default-to-ld.bfd-on-ARM64.patch
|
||||
@ -541,6 +539,7 @@ find $RPM_BUILD_ROOT%{goroot}/src -exec touch -r $RPM_BUILD_ROOT%{goroot}/VERSIO
|
||||
# and level out all the built archives
|
||||
touch $RPM_BUILD_ROOT%{goroot}/pkg
|
||||
find $RPM_BUILD_ROOT%{goroot}/pkg -exec touch -r $RPM_BUILD_ROOT%{goroot}/pkg "{}" \;
|
||||
|
||||
# generate the spec file ownership of this source tree and packages
|
||||
cwd=$(pwd)
|
||||
src_list=$cwd/go-src.list
|
||||
@ -550,6 +549,8 @@ race_list=$cwd/go-race.list
|
||||
misc_list=$cwd/go-misc.list
|
||||
docs_list=$cwd/go-docs.list
|
||||
tests_list=$cwd/go-tests.list
|
||||
|
||||
# ensure they don't exist
|
||||
rm -f $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list
|
||||
touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list
|
||||
|
||||
@ -557,18 +558,30 @@ touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_l
|
||||
# Register files #
|
||||
##################
|
||||
pushd $RPM_BUILD_ROOT%{goroot}
|
||||
find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list
|
||||
find src/ ! -type d -a \( ! -ipath '*/testdata/*' -a ! -name '*_test.go' \) -printf '%{goroot}/%p\n' >> $src_list
|
||||
|
||||
find bin/ pkg/ -type d -a ! -path '*_dynlink/*' -a ! -path '*_race/*' -printf '%%%dir %{goroot}/%p\n' >> $pkg_list
|
||||
find bin/ pkg/ ! -type d -a ! -path '*_dynlink/*' -a ! -path '*_race/*' -printf '%{goroot}/%p\n' >> $pkg_list
|
||||
# Src
|
||||
find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list
|
||||
find src/ ! -type d -a \( ! -ipath '*/testdata/*' -a ! -name '*_test.go' \) -printf '%{goroot}/%p\n' >> $src_list
|
||||
|
||||
find doc/ -type d -printf '%%%dir %{goroot}/%p\n' >> $docs_list
|
||||
find doc/ ! -type d -printf '%{goroot}/%p\n' >> $docs_list
|
||||
# Bin
|
||||
find bin/ pkg/ -type d -a ! -path '*_dynlink/*' -a ! -path '*_race/*' -printf '%%%dir %{goroot}/%p\n' >> $pkg_list
|
||||
find bin/ pkg/ ! -type d -a ! -path '*_dynlink/*' -a ! -path '*_race/*' -printf '%{goroot}/%p\n' >> $pkg_list
|
||||
|
||||
find misc/ -type d -printf '%%%dir %{goroot}/%p\n' >> $misc_list
|
||||
find misc/ ! -type d -printf '%{goroot}/%p\n' >> $misc_list
|
||||
# Docs
|
||||
find doc/ -type d -printf '%%%dir %{goroot}/%p\n' >> $docs_list
|
||||
find doc/ ! -type d -printf '%{goroot}/%p\n' >> $docs_list
|
||||
|
||||
# Misc
|
||||
find misc/ -type d -printf '%%%dir %{goroot}/%p\n' >> $misc_list
|
||||
find misc/ ! -type d -printf '%{goroot}/%p\n' >> $misc_list
|
||||
|
||||
# Tests
|
||||
find test/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list
|
||||
find test/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list
|
||||
find src/ -type d -a \( -name testdata -o -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $tests_list
|
||||
find src/ ! -type d -a \( -ipath '*/testdata/*' -o -name '*_test.go' \) -printf '%{goroot}/%p\n' >> $tests_list
|
||||
|
||||
# Shared
|
||||
%if %{shared}
|
||||
mkdir -p %{buildroot}/%{_libdir}/
|
||||
mkdir -p %{buildroot}/%{golibdir}/
|
||||
@ -585,14 +598,8 @@ pushd $RPM_BUILD_ROOT%{goroot}
|
||||
find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
|
||||
find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
|
||||
%endif
|
||||
find test/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list
|
||||
find test/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list
|
||||
find src/ -type d -a \( -name testdata -o -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $tests_list
|
||||
find src/ ! -type d -a \( -ipath '*/testdata/*' -o -name '*_test.go' \) -printf '%{goroot}/%p\n' >> $tests_list
|
||||
# this is only the zoneinfo.zip
|
||||
find lib/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list
|
||||
find lib/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list
|
||||
popd
|
||||
|
||||
# remove the doc Makefile
|
||||
rm -rfv $RPM_BUILD_ROOT%{goroot}/doc/Makefile
|
||||
|
||||
@ -715,7 +722,7 @@ fi
|
||||
# go files
|
||||
%dir %{goroot}
|
||||
%{goroot}/api/
|
||||
%{goroot}/lib/time/
|
||||
%{goroot}/lib/
|
||||
|
||||
# ensure directory ownership, so they are cleaned up if empty
|
||||
%dir %{gopath}
|
||||
@ -777,11 +784,29 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Dec 09 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1.25.3-1.alma.2
|
||||
* Fri Jan 23 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1.25.5-1.alma.1
|
||||
- Update env var for v2
|
||||
- Disable race for riscv64
|
||||
|
||||
## START: Generated by rpmautospec
|
||||
* Mon Jan 19 2026 dbenoit <dbenoit@redhat.com> - 1.25.5-1
|
||||
- Update to Go 1.25.5 (fips-1)
|
||||
|
||||
* Wed Dec 17 2025 Edjunior Machado <emachado@redhat.com> - 1.25.3-5
|
||||
- gating.yaml: Add tier1 s390x tests
|
||||
|
||||
* Wed Dec 10 2025 Alejandro Sáez <asm@redhat.com> - 1.25.3-4
|
||||
- Cleanup lib/ ownership
|
||||
- Remove legacy logic forcing lib/ into golang-tests
|
||||
- Move lib/wasm, lib/fips140, and lib/time to main golang package
|
||||
- Fixes go_js_wasm_exec availability
|
||||
|
||||
* Tue Dec 09 2025 Edjunior Machado <emachado@redhat.com> - 1.25.3-3
|
||||
- plans/tier0.fmf: Import plan
|
||||
|
||||
* Tue Dec 09 2025 Edjunior Machado <emachado@redhat.com> - 1.25.3-2
|
||||
- rpminspect.yaml: Add testdata to annocheck ignore
|
||||
|
||||
* Wed Oct 29 2025 Alejandro Sáez <asm@redhat.com> - 1.25.3-1
|
||||
- Update to Go 1.25.3
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d
|
||||
SHA512 (go1.25.3-1-openssl-fips.tar.gz) = 4eb308049af031123a8d9745ced4d3d296362b8a5a65cef9542841ce880b0c1e682476f70291192d7ddf7a006bb65f5672019d2508216a448eaeca026402b45c
|
||||
SHA512 (go1.25.3.src.tar.gz) = 91d32bbff864c06b5ee7b914d3d95c59462352a4c395adba85eaab72704a8aa4d19ac2a361ed64774dce3c8e01a8d4feadf1a788814f6d7b4072a3bdfefbb3b4
|
||||
SHA512 (go1.25.5-1-openssl-fips.tar.gz) = 84c5218400de7143646042f3104f9c8af30f35e94f238af8904b5a4d85ef9f446b3b0d5a0ced85f6e22ef0a23217f371467161d0850f03ede425678b8a103aee
|
||||
SHA512 (go1.25.5.src.tar.gz) = 97ec368521253bce610e1e3a6f10460f4a38eba440289553a40ab27afcdf2bb9b426d150ffaa3be8db50e84a00a4eb723a631ebc4f39168bc133bf7b2f1ccf66
|
||||
|
||||
Loading…
Reference in New Issue
Block a user