SHA256
1
0
forked from pool/apptainer

Accepting request 1003477 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/1003477
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apptainer?expand=0&rev=6
This commit is contained in:
2022-09-14 11:45:18 +00:00
committed by Git OBS Bridge
7 changed files with 1848 additions and 9 deletions

1784
70.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a16e59996096cd22b5ac415f2bd09f2c978609da57ee59b3209cd2c6246c9840
size 5169775

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47370ae1413fffe7ae22c4bc0be0bbd63e48037154050cd6bd2d84113fcea4a8
size 5175856

View File

@@ -1,7 +1,40 @@
-------------------------------------------------------------------
Fri Sep 9 08:50:33 UTC 2022 - Christian Goll <cgoll@suse.com>
- Updated to version 1.1.0-rc3 with following changes:
* added squashfuse-0.1.105.tar.gz and 70.patch for the build of squashfuse_ll
which will be removed as soon as the multithread patch is incoperated
* Change squash mounts to prefer to use squashfuse_ll instead of squashfuse,
if available, for improved performance. squashfuse_ll is not available
in factory.
* Also, for even better parallel performance, include a patched
multithreaded version of squashfuse_ll in
* Imply adding ${prefix}/libexec/apptainer/bin to the binary path in
apptainer.conf, which is used for searching for helper executables. It is
implied as the first directory of $PATH if present (which is at the
beginning of binary path by default) or just as the first directory if
$PATH is not included in binary path.
${prefix}/libexec/apptainer/bin.
* Add --unsquash action flag to temporarily convert a SIF file to a sandbox
before running. In previous versions this was the default when running a
SIF file without setuid or with fakeroot, but now the default is to instead
mount with squashfuse.
* Add --sparse flag to overlay create command to allow generation of a sparse
ext3 overlay image.
* Support for a custom hashbang in the %test section of an Apptainer recipe
(akin to the runscript and start sections).
* When using fakeroot in setuid mode, have the image drivers first enter the
the container's user namespace to avoid write errors with overlays.
* Skip trying to use kernel overlayfs when using writable overlay and the
lower layer is FUSE, because of a kernel bug introduced in kernel 5.15.
* Add additional hidden options to the action command for testing different
fakeroot modes with --fakeroot: --ignore-subuid, --ignore-fakeroot-command,
and --ignore-userns.
-------------------------------------------------------------------
Fri Aug 19 10:07:20 UTC 2022 - Christian Goll <cgoll@suse.com>
- Udpated to version 1.1.0-rc2 with following changes:
- Updated to version 1.1.0-rc2 with following changes:
* Fixed longstanding bug in the underlay logic when there are nested bind
points separated by more than one path level, for example /var and
/var/lib/yum, and the path didn't exist in the container image. The bug

View File

@@ -19,7 +19,8 @@
%define apptainerpath src/github.com/apptainer/
%define _buildshell /bin/bash
%define vers_suffix -rc.2
%define vers_suffix -rc.3
%global squashfuse_version 0.1.105
Summary: Application and environment virtualization
License: BSD-3-Clause-LBNL
@@ -34,7 +35,11 @@ Source1: README.SUSE
Source2: SLE-12SP5.def
Source3: SLE-15SP3.def
Source5: %{name}-rpmlintrc
Source10: vendor.tar.gz
Source9: vendor.tar.gz
%if "%{?squashfuse_version}" != ""
Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
Patch10: https://github.com/vasi/squashfuse/pull/70.patch
%endif
BuildRequires: cryptsetup
BuildRequires: fdupes
BuildRequires: gcc
@@ -48,6 +53,14 @@ BuildRequires: sysuser-tools
BuildRequires: binutils-gold
%endif
BuildRequires: libseccomp-devel
%if "%{?squashfuse_version}" != ""
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fuse3-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%endif
Requires: squashfs
PreReq: permissions
@@ -63,6 +76,12 @@ Singularity provides functionality to make portable
containers that can be used across host environments.
%prep
%if "%{?squashfuse_version}" != ""
# the default directory for other steps is where the %prep section ends
# so do main package last
%setup -b 10 -n squashfuse-%{squashfuse_version}
%patch -P 10 -p1
%endif
%setup -q -n gopath/%{apptainerpath} -c
cp %{S:1} %{S:2} %{S:3} .
mv %{name}-%{version}%{?vers_suffix} %{name}
@@ -74,7 +93,7 @@ cd %{name}
echo %version > VERSION
# Not all of these parameters currently have an effect, but they might be
# used someday. They are the same parameters as in the configure macro.
tar xzf %{S:10}
tar xzf %{S:9}
./mconfig -V %{version}-%{release} \
-P release \
--prefix=%{_prefix} \

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f776892ab2044ecca417be348e482fee2839db75e35d165b53737cb8153ab1e
size 65644

View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f28d695f5646e10dc7fcdf8e35d6a4fdf1f26c23d6291c7664bb4042fbebfe0
size 7205851
oid sha256:c68491bfd2bbe56d6fa6fd83bc97523cad65372aade5c659efd0b1f0d5241901
size 7214251