From bf8d24e9f6d07215e1cb9a03386fa2f485653a6e Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Tue, 15 Oct 2024 20:42:31 +0800 Subject: [PATCH] add loong64 support for bbolt (cherry picked from commit b09ed19ee3619df15fdcc47753254d36f42929d7) --- add-loong64-support-for-bbolt.patch | 29 +++++++++++++++++++++++++++++ apptainer.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 add-loong64-support-for-bbolt.patch diff --git a/add-loong64-support-for-bbolt.patch b/add-loong64-support-for-bbolt.patch new file mode 100644 index 0000000..379f8a9 --- /dev/null +++ b/add-loong64-support-for-bbolt.patch @@ -0,0 +1,29 @@ +From: Your Name +Date: Fri, 6 Jan 2023 01:20:46 +0000 +Subject: [PATCH] add loong64 support for bbolt + +--- + vendor/go.etcd.io/bbolt/bolt_loong64.go | 12 ++++++++++++ + 1 file changed, 12 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 00000000..aa8de7b1 +--- /dev/null ++++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go +@@ -0,0 +1,12 @@ ++// +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/apptainer.spec b/apptainer.spec index b11180c..01a14d7 100644 --- a/apptainer.spec +++ b/apptainer.spec @@ -42,7 +42,7 @@ Summary: Application and environment virtualization formerly known as Singularity Name: apptainer Version: 1.1.6 -Release: 1 +Release: 2 # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD) # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0) # See LICENSE_DEPENDENCIES.md for dependencies @@ -57,6 +57,7 @@ Patch10: 70.patch Patch11: 77.patch Patch12: 81.patch %endif +Patch13: add-loong64-support-for-bbolt.patch # This Conflicts is in case someone tries to install the main apptainer # package when an old singularity package is installed. An Obsoletes is on @@ -287,6 +288,7 @@ Provides the optional setuid-root portion of Apptainer. %patch -P 11 -p1 %patch -P 12 -p1 %setup -n %{name}-%{package_version} +%patch -P 13 -p1 %else %autosetup -n %{name}-%{package_version} %endif @@ -432,5 +434,8 @@ fi %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid %changelog +* Tue Oct 15 2024 Wenlong Zhang - 1.1.6-2 +- add loong64 support for bbolt + * Tue Feb 21 2023 Yikun - 1.1.6-1 - Init package -- Gitee