From eb3cbdd62865ffe8b3566e0f932404b8e56f6227 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Thu, 28 Nov 2019 14:57:02 +0530 Subject: 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) --- contrib/build_rpm.sh | 8 ++++++-- contrib/spec/podman.spec.in | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'contrib') 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 -- cgit v1.2.3-54-g00ecf