Skip to content

Commit

Permalink
rpm: fix: correct BuildRequires/Requires for SLES
Browse files Browse the repository at this point in the history
* On SLES we intend to require runc, not crun.
* squashfs had a duplicate Requires, instead of a BuildRequires.

Fixes sylabs#1453
  • Loading branch information
dtrudg committed Mar 17, 2023
1 parent 8382293 commit 98c22f4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
retrieve a CLI token to interact with the OCI registry of a
Singularity Enterprise instance.

### Bug Fixes

- Require `runc` in RPM packages built on SLES, not `crun`, because `crun` is
part of the Package Hub community repository that may not be enabled.
SingularityCE will still prefer `crun` if it has been installed.

## 3.11.1 \[2023-03-14\]

### New Features & Functionality
Expand Down
10 changes: 5 additions & 5 deletions dist/rpm/singularity-ce.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ BuildRequires: make
# Paths to runtime dependencies detected by mconfig, so must be present at build time.
BuildRequires: cryptsetup
%if "%{_target_vendor}" == "suse"
Requires: squashfs
BuildRequires: squashfs
%else
Requires: squashfs-tools
BuildRequires: squashfs-tools
%endif
# Required for building bundled conmon
BuildRequires: libseccomp-devel
BuildRequires: glib2-devel

# crun requirement not satisfied on EL7 or SLES default repos - use runc there.
%if "%{_target_vendor}" == "suse" || 0%{?rhel} > 7
Requires: crun
%else
%if "%{_target_vendor}" == "suse" || 0%{?rhel} < 8
Requires: runc
%else
Requires: crun
%endif
%if "%{_target_vendor}" == "suse"
Requires: squashfs
Expand Down

0 comments on commit 98c22f4

Please sign in to comment.