From 3ae08f0ff91507d8c42334e0e58b41f0690e6068 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 25 Mar 2026 15:27:13 +0100 Subject: [PATCH 1/3] go: updated to newer version; git-lsf use prebuild binary --- git-lfs.spec | 12 +++--------- go-bootstrap.sh | 13 +++++++++++++ go.spec | 19 +++++++------------ rpm-preamble.file | 11 +++++++++++ 4 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 go-bootstrap.sh diff --git a/git-lfs.spec b/git-lfs.spec index c117ed850ca..94fe27c538b 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -1,17 +1,11 @@ -### RPM external git-lfs 3.6.0 -Source: https://github.com/git-lfs/git-lfs/archive/v%{realversion}.tar.gz -BuildRequires: gmake go +### RPM external git-lfs 3.7.1 +Source: https://github.com/git-lfs/git-lfs/releases/download/v%{realversion}/git-lfs-linux-%{go_package_arch}-v%{realversion}.tar.gz Requires: git %prep %setup -n %{n}-%{realversion} %build -make %{makeprocesses} \ - VERSION=v%{realversion} \ - GIT_LFS_SHA=%{realversion} \ - GO=$(which go) %install -mkdir -p %{i}/bin -mv bin/git-lfs %{i}/bin +PREFIX=%{i} ./install.sh diff --git a/go-bootstrap.sh b/go-bootstrap.sh new file mode 100644 index 00000000000..0144c5f6751 --- /dev/null +++ b/go-bootstrap.sh @@ -0,0 +1,13 @@ +### RPM external go-bootstrap 1.22.6 +## NOCOMPILER + +Provides: /bin/rc +Source: https://go.dev/dl/go%{realversion}.linux-%{go_package_arch }.tar.gz + +%prep +%setup -n go + +%build + +%install +rsync -a ./ %i/ diff --git a/go.spec b/go.spec index 543f6d65bcd..5041833bf55 100644 --- a/go.spec +++ b/go.spec @@ -1,20 +1,15 @@ -### RPM external go 1.22.5 -## NOCOMPILER - -%ifarch x86_64 -%define download_arch amd64 -%elifarch aarch64 -%define download_arch arm64 -%else -%define download_arch %{_arch} -%endif -Provides: /bin/rc -Source: https://go.dev/dl/go%{realversion}.linux-%{download_arch}.tar.gz +### RPM external go 1.26.1 +BuildRequires: go-bootstrap +AutoReqProv: no +Source: https://go.dev/dl/go%{realversion}.src.tar.gz %prep %setup -n go %build +cd src +export GOROOT_BOOTSTRAP=${GO_BOOTSTRAP_ROOT} +./make.bash %install rsync -a ./ %i/ diff --git a/rpm-preamble.file b/rpm-preamble.file index 0e6cc7f4bc8..d060aed480a 100644 --- a/rpm-preamble.file +++ b/rpm-preamble.file @@ -414,3 +414,14 @@ fi %{?without_cuda:%{!?without_gdrcopy:%define without_gdrcopy 1}} %{?without_cuda:%{!?without_cudnn:%define without_cudnn 1}} %{?without_rocm:%{!?without_rocm_rocrand:%define without_rocm_rocrand 1}} + +######################################### +# Helper macros for go based packages architecture +######################################### +%ifarch x86_64 +%define go_package_arch amd64 +%elifarch aarch64 +%define go_package_arch arm64 +%else +%define go_package_arch %{_arch} +%endif From b1db7929fddd8362f5b9b65ae8627b7875b85f36 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 25 Mar 2026 15:34:16 +0100 Subject: [PATCH 2/3] typo: rename go-bootstrap.sh to go-bootstrap.spec --- go-bootstrap.sh => go-bootstrap.spec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename go-bootstrap.sh => go-bootstrap.spec (100%) diff --git a/go-bootstrap.sh b/go-bootstrap.spec similarity index 100% rename from go-bootstrap.sh rename to go-bootstrap.spec From 591413934fc1ddbe060e66f2274d178216754a62 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 25 Mar 2026 17:03:32 +0100 Subject: [PATCH 3/3] build go version 1.25.5 --- go.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.spec b/go.spec index 5041833bf55..432a200c7fa 100644 --- a/go.spec +++ b/go.spec @@ -1,4 +1,4 @@ -### RPM external go 1.26.1 +### RPM external go 1.25.5 BuildRequires: go-bootstrap AutoReqProv: no Source: https://go.dev/dl/go%{realversion}.src.tar.gz