diff --git a/add-loong64-support-for-bbolt.ptch b/add-loong64-support-for-bbolt.ptch deleted file mode 100644 index 5c5d5faf056d8196912c58a33cd93fb683e7d406..0000000000000000000000000000000000000000 --- a/add-loong64-support-for-bbolt.ptch +++ /dev/null @@ -1,31 +0,0 @@ -From ede7f7ed58d034507643a98aeca453dba0f497fb Mon Sep 17 00:00:00 2001 -From: build -Date: Thu, 5 Jan 2023 12:37:27 +0000 -Subject: [PATCH] containerd add blot symbol to support loong64 - ---- - vendor/go.etcd.io/bbolt/bolt_loong64.go | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go - -diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go -new file mode 100644 -index 0000000..bb402fb ---- /dev/null -+++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go -@@ -0,0 +1,13 @@ -+// +build loong64 -+ -+package bbolt -+ -+// maxMapSize represents the largest mmap size supported by Bolt. -+const maxMapSize = 0x8000000000 // 512GB -+ -+// maxAllocSize is the size used when creating array pointers. -+const maxAllocSize = 0x7FFFFFFF -+ -+// Are unaligned load/stores broken on this arch? -+var brokenUnaligned = false -+ --- -2.33.0 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 c77d052eb84fe88a31a8d849bdc379ff15f5360e..d96c4bca51709dc16e84f53791709022e3455b8e 100644 --- a/buildkit.spec +++ b/buildkit.spec @@ -1,23 +1,17 @@ -%define release_version 0.10.5 -%define pre_version rc.1 -%define anolis_release 3 +%define release_version 0.12.5 %global debug_package %{nil} Name: buildkit -Version: %{release_version}~%{pre_version} +Version: %{release_version} Release: %{anolis_release}%{?dist} Summary: A toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. 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 +URL: https://github.com/moby/buildkit +Source0: %{name}-v%{release_version}.tar.gz +Source1: %{name}-v%{release_version}-vendor.tar.gz 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. @@ -31,19 +25,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%setup -n %{name}-v%{release_version}-%{pre_version} -tar -xzf %{SOURCE1} - -%patch001 -p1 -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 - +%setup -n %{name}-%{release_version} %build go build -ldflags "-X 'github.com/moby/buildkit/version.Version=v%{release_version}-%{pre_version}'" -tags=nydus -mod=vendor -o ./bin/buildkitd ./cmd/buildkitd @@ -65,6 +47,9 @@ install -Dpm 0755 ./bin/buildkitd %{buildroot}%{_bindir}/buildkitd %doc AUTHORS README.md %changelog +* Thu May 15 2024 Chen Qiao - 0.12.5-1 +- upstream to 0.12.5 + * Thu Oct 26 2023 Wenlong Zhang - 0.10.5~rc.1-3 - fix build error for loongarch64