diff --git a/buildkit-v0.10.5-rc.1.tar.gz b/buildkit-v0.12.5-rc.1-vendor.tar.gz similarity index 51% rename from buildkit-v0.10.5-rc.1.tar.gz rename to buildkit-v0.12.5-rc.1-vendor.tar.gz index cb636bfb9ef8fd86503a209564e17dda76e732b9..6cdf76ab7b6bbcee7f64670a67c51eb4b1ed9464 100644 Binary files a/buildkit-v0.10.5-rc.1.tar.gz and b/buildkit-v0.12.5-rc.1-vendor.tar.gz differ diff --git a/buildkit-v0.10.5-rc.1-vendor.tar.gz b/buildkit-v0.12.5-rc.1.tar.gz similarity index 44% rename from buildkit-v0.10.5-rc.1-vendor.tar.gz rename to buildkit-v0.12.5-rc.1.tar.gz index c6911aba15b69d5b096428eac1110f6c52b38866..34ead78f8467e5293246e3352bc3f304c694d161 100644 Binary files a/buildkit-v0.10.5-rc.1-vendor.tar.gz and b/buildkit-v0.12.5-rc.1.tar.gz differ diff --git a/buildkit.spec b/buildkit.spec index 69b1d1af3f7b09f18b59d704ad2a5e62b5d1d9cf..e602f6908167a129e85f7400c1b055201dcf70f7 100644 --- a/buildkit.spec +++ b/buildkit.spec @@ -1,6 +1,6 @@ -%define release_version 0.10.5 +%define release_version 0.12.5 %define pre_version rc.1 -%define anolis_release 1 +%define anolis_release 3 %global debug_package %{nil} Name: buildkit @@ -12,8 +12,12 @@ License: Apache-2.0 URL: https://github.com/imeoer/buildkit/tree/nydus-compression-type Source0: %{name}-v%{release_version}-%{pre_version}.tar.gz Source1: %{name}-v%{release_version}-%{pre_version}-vendor.tar.gz +Patch001: add-loong64-support-for-bbolt.ptch BuildRequires: golang >= 1.18 +%ifarch loongarch64 +BuildRequires: golang-vendored-golang.org +%endif %description BuildKit is a toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. @@ -27,11 +31,20 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%autosetup -n %{name}-v%{release_version}-%{pre_version} +%setup -n %{name}-v%{release_version}-%{pre_version} +tar -xzf %{SOURCE1} + go env -w GOFLAGS="-mod=vendor" +%ifarch loongarch64 +rm -rf %{_builddir}/%{name}-v%{release_version}-%{pre_version}/vendor/golang.org/x/sys +rm -rf %{_builddir}/%{name}-v%{release_version}-%{pre_version}/vendor/golang.org/x/net +cp -r /usr/share/golang/vendor/sys %{_builddir}/%{name}-v%{release_version}-%{pre_version}/vendor/golang.org/x/ +cp -r /usr/share/golang/vendor/net %{_builddir}/%{name}-v%{release_version}-%{pre_version}/vendor/golang.org/x/ +%endif + + %build -tar -xzf %{SOURCE1} go build -ldflags "-X 'github.com/moby/buildkit/version.Version=v%{release_version}-%{pre_version}'" -tags=nydus -mod=vendor -o ./bin/buildkitd ./cmd/buildkitd %install @@ -51,5 +64,14 @@ install -Dpm 0755 ./bin/buildkitd %{buildroot}%{_bindir}/buildkitd %doc AUTHORS README.md %changelog +* Thu May 15 2024 Chen Qiao - 0.12.5~rc.1 +- upstream to 0.12.5 + +* Thu Oct 26 2023 Wenlong Zhang - 0.10.5~rc.1-3 +- fix build error for loongarch64 + +* Wed Sep 13 2023 Wenlong Zhang - 0.10.5~rc.1-2 +- add loong64 support for buildkit + * Tue Nov 8 2022 Qinqi Qu - 0.10.5~rc.1-1 -- Support for exporting nydus compression type \ No newline at end of file +- Support for exporting nydus compression type