summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-29 12:02:37 +0100
committerGitHub <noreply@github.com>2019-11-29 12:02:37 +0100
commit1c0356ee919d7ad316e200171ff974e68d713789 (patch)
tree31b97f4a2bb1c12ed50941db8fe0fd583cf90e03 /contrib
parent39b14405c303d9b587f3d3ddc5e7ab526aa5dcb7 (diff)
parenteb3cbdd62865ffe8b3566e0f932404b8e56f6227 (diff)
downloadpodman-1c0356ee919d7ad316e200171ff974e68d713789.tar.gz
podman-1c0356ee919d7ad316e200171ff974e68d713789.tar.bz2
podman-1c0356ee919d7ad316e200171ff974e68d713789.zip
Merge pull request #4587 from raukadah/btrfs
Disable btrfs for RHEL in podman spec
Diffstat (limited to 'contrib')
-rw-r--r--contrib/build_rpm.sh8
-rw-r--r--contrib/spec/podman.spec.in3
2 files changed, 9 insertions, 2 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh
index c79e49772..b2560fb1a 100644
--- a/contrib/build_rpm.sh
+++ b/contrib/build_rpm.sh
@@ -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[*]}
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 98cd26a4f..f282642f3 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -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