summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Kumar (raukadah) <raukadah@gmail.com>2019-11-28 14:57:02 +0530
committerChandan Kumar (raukadah) <raukadah@gmail.com>2019-11-28 18:38:22 +0530
commiteb3cbdd62865ffe8b3566e0f932404b8e56f6227 (patch)
treee10ca73fb518b5ac3c98352ebd61955846bdce24
parent2178875fa7975f00a4da15fef9809cd3fb74feba (diff)
downloadpodman-eb3cbdd62865ffe8b3566e0f932404b8e56f6227.tar.gz
podman-eb3cbdd62865ffe8b3566e0f932404b8e56f6227.tar.bz2
podman-eb3cbdd62865ffe8b3566e0f932404b8e56f6227.zip
Donot install btrfs in RHEL/CentOS-8
Since btrfs-progs-devel is not available in RHEL/CentOS 8 and the spec fails to build it while running build_rpm.sh, making it optional fixes the issue. It also modifies the spec file to install btrfs-progs-devel for fedora only. Since golang-github-cpuguy83-go-md2man was added twice, it also removes the repetition. Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
-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 1132ef380..628654339 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 33ecc8eba..7035297dd 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -52,7 +52,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