containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chandan Kumar (raukadah) 2019-11-28 14:57:02 +05:30
parent 2178875fa7
commit eb3cbdd628
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/build_rpm.sh
View File

@ -28,9 +28,7 @@ declare -a PKGS=(device-mapper-devel \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
make \ make \
golang-github-cpuguy83-go-md2man \
rpm-build \ rpm-build \
btrfs-progs-devel \
go-compilers-golang-compiler \ go-compilers-golang-compiler \
) )
@ -38,6 +36,12 @@ if [ $pkg_manager == "/usr/bin/dnf" ]; then
PKGS+=(python3-devel \ PKGS+=(python3-devel \
python3-varlink \ 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 fi
echo ${PKGS[*]} echo ${PKGS[*]}

3
contrib/spec/podman.spec.in
View File

@ -52,7 +52,10 @@ ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
# The COPR process will uncomment this # The COPR process will uncomment this
#BuildRequires: golang-bin #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 BuildRequires: btrfs-progs-devel
%endif
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: glibc-static BuildRequires: glibc-static