packages/apptainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add squashfuse as require and patch for golang version

Browse Source 
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
This commit is contained in:
Yikun Jiang 2023-03-31 10:26:38 +08:00
parent da8500a631
commit bae93ed7e7
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apptainer.spec
View File

@ -42,14 +42,16 @@
Summary: Application and environment virtualization formerly known as Singularity Summary: Application and environment virtualization formerly known as Singularity
Name: apptainer Name: apptainer
Version: 1.1.6 Version: 1.1.6
Release: 1 Release: 2
# See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD) # 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_THIRD_PARTY.md for incorporated code (ASL 2.0)
# See LICENSE_DEPENDENCIES.md for dependencies # See LICENSE_DEPENDENCIES.md for dependencies
# License identifiers taken from: https://fedoraproject.org/wiki/Licensing # License identifiers taken from: https://fedoraproject.org/wiki/Licensing
License: BSD and LBNL BSD and ASL 2.0 License: BSD and LBNL BSD and ASL 2.0
URL: https://apptainer.org URL: https://apptainer.org
Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz Source0: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz
Patch0: openEuler-golang-1.17.3.patch
%if "%{?squashfuse_version}" != "" %if "%{?squashfuse_version}" != ""
Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
@ -251,7 +253,7 @@ BuildRequires: pkgconfig
BuildRequires: fuse3-devel BuildRequires: fuse3-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
%endif %endif
# Requires: squashfuse Requires: squashfuse
Requires: fakeroot Requires: fakeroot
Requires: fuse-overlayfs Requires: fuse-overlayfs
Requires: e2fsprogs Requires: e2fsprogs
@ -287,6 +289,7 @@ Provides the optional setuid-root portion of Apptainer.
%patch -P 11 -p1 %patch -P 11 -p1
%patch -P 12 -p1 %patch -P 12 -p1
%setup -n %{name}-%{package_version} %setup -n %{name}-%{package_version}
%patch -P 0 -p1
%else %else
%autosetup -n %{name}-%{package_version} %autosetup -n %{name}-%{package_version}
%endif %endif
@ -432,5 +435,7 @@ fi
%attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
%changelog %changelog
* Fri Mar 31 2023 Yikun<yikunkero@gmail.com> - 1.1.6-2
- Patch golang version for openEuler 22.03 series
* Tue Feb 21 2023 Yikun<yikunkero@gmail.com> - 1.1.6-1 * Tue Feb 21 2023 Yikun<yikunkero@gmail.com> - 1.1.6-1
- Init package - Init package

15
openEuler-golang-1.17.3.patch Normal file
View File

@ -0,0 +1,15 @@
diff -uprN apptainer-1.1.6/mconfig apptainer-1.1.6-new/mconfig
--- apptainer-1.1.6/mconfig 2023-02-14 21:46:54.000000000 +0000
+++ apptainer-1.1.6-new/mconfig 2023-02-23 16:53:01.416175595 +0000
@@ -24,8 +24,8 @@ hstld=
hstranlib=
hstobjcopy=
hstgo=
-hstgo_version="1.17.5"
-hstgo_preferred_version="1.17.5"
+hstgo_version="1.17.3"
+hstgo_preferred_version="1.17.3"
hstgo_opts="go"
tgtcc=