Merge pull request #4587 from raukadah/btrfs

Disable btrfs for RHEL in podman spec
This commit is contained in:
OpenShift Merge Robot
2019-11-29 12:02:37 +01:00
committed by GitHub
2 changed files with 9 additions and 2 deletions

View File

@ -28,9 +28,7 @@ declare -a PKGS=(device-mapper-devel \
libseccomp-devel \
libselinux-devel \
make \
golang-github-cpuguy83-go-md2man \
rpm-build \
btrfs-progs-devel \
go-compilers-golang-compiler \
)
@ -38,6 +36,12 @@ if [ $pkg_manager == "/usr/bin/dnf" ]; then
PKGS+=(python3-devel \
python3-varlink \
)
# btrfs-progs-devel is not available in CentOS/RHEL-8
if ! grep -i -q 'Red Hat\|CentOS' /etc/redhat-release; then
PKGS+=(btrfs-progs-devel)
fi
fi
echo ${PKGS[*]}

View File

@ -53,7 +53,10 @@ ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
# The COPR process will uncomment this
#BuildRequires: golang-bin
#
# btrfs-progs-devel package is not available in CentOS/RHEL-8
%if 0%{?rhel} != 8 && 0%{?centos} != 8
BuildRequires: btrfs-progs-devel
%endif
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: glibc-static