Skip to content

Commit e0276b3

Browse files
committed
Fix RHEL package build
1 parent abbee69 commit e0276b3

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

doc/installation.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ sudo apt install -y ./*.deb
5454

5555
# RHEL-based distributions
5656
arch=$(uname -m)
57-
sudo yum install -y epel-release # required on some distributions
58-
sudo yum install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-3.4.0-2.el7.${arch}.rpm
59-
sudo yum install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot+caps-3.4.0-2.el7.${arch}.rpm # optional
57+
sudo dnf install -y epel-release # required on some distributions
58+
sudo dnf install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-3.4.0-2.el7.${arch}.rpm
59+
sudo dnf install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot+caps-3.4.0-2.el7.${arch}.rpm # optional
6060
```
6161

6262
#### Hardened flavor
@@ -70,9 +70,9 @@ sudo apt install -y ./*.deb
7070

7171
# RHEL-based distributions
7272
arch=$(uname -m)
73-
sudo yum install -y epel-release # required on some distributions
74-
sudo yum install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-hardened-3.4.0-2.el7.${arch}.rpm
75-
sudo yum install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-hardened+caps-3.4.0-2.el7.${arch}.rpm # optional
73+
sudo dnf install -y epel-release # required on some distributions
74+
sudo dnf install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-hardened-3.4.0-2.el7.${arch}.rpm
75+
sudo dnf install -y https://github.com/NVIDIA/enroot/releases/download/v3.4.0/enroot-hardened+caps-3.4.0-2.el7.${arch}.rpm # optional
7676
```
7777

7878
## From source
@@ -83,7 +83,7 @@ Install the build dependencies and clone the repository:
8383
sudo apt install -y git gcc make libcap2-bin libtool automake libmd-dev
8484

8585
# RHEL-based distributions:
86-
sudo yum install -y git gcc make libcap libtool automake libmd-devel
86+
sudo dnf install -y git gcc make libcap libtool automake libmd-devel
8787

8888
# Archlinux-based distributions:
8989
sudo pacman --noconfirm -S git gcc make libtool automake libmd
@@ -98,9 +98,9 @@ sudo apt install -y curl gawk jq squashfs-tools parallel
9898
sudo apt install -y fuse-overlayfs libnvidia-container-tools pigz squashfuse # optional
9999

100100
# RHEL-based distributions
101-
sudo yum install -y epel-release # required on some distributions
102-
sudo yum install -y jq squashfs-tools parallel
103-
sudo yum install -y fuse-overlayfs libnvidia-container-tools pigz squashfuse # optional
101+
sudo dnf install -y epel-release # required on some distributions
102+
sudo dnf install -y jq squashfs-tools parallel
103+
sudo dnf install -y fuse-overlayfs libnvidia-container-tools pigz squashfuse # optional
104104

105105
# Archlinux-based distributions
106106
sudo pacman --noconfirm -S jq parallel squashfs-tools

pkg/rpm/SPECS/enroot.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Vendor: %{USERNAME}
1111
Packager: %{USERNAME} <%{EMAIL}>
1212
URL: https://github.com/NVIDIA/enroot
1313

14-
BuildRequires: make gcc libtool
14+
BuildRequires: make gcc libtool libmd-devel
1515

1616
Summary: Unprivileged container sandboxing utility
1717
%if "%{?getenv:PACKAGE}" != ""

pkg/rpmbuild

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ environ() {
1212
}
1313

1414
rc() {
15-
yum install -y \
15+
dnf install -y epel-release
16+
17+
dnf install -y \
1618
libtool \
1719
gcc \
1820
make \
1921
rpm-build \
20-
rpmlint
22+
rpmlint \
23+
libmd-devel
2124

2225
cd /usr/local/src/enroot
2326

0 commit comments

Comments
 (0)