Fix CentOS 8 build

- Enable PowerTools repo
- Disable building btrfs, which is no longer supported on
  CentOS/RHEL

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a03dda0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f96d17612f38a7941e01e2bb70d0162d5e2fa08d
Component: packaging

Author: thaJeztah

components/packaging/rpm/Makefile

@@ -33,6 +33,7 @@ RPMBUILD_FLAGS?=-ba\
 	--define '_release $(word 2,$(GEN_RPM_VER))' \
 	--define '_version $(word 1,$(GEN_RPM_VER))' \
 	--define '_origversion $(word 4, $(GEN_RPM_VER))' \
+	$(RPMBUILD_EXTRA_FLAGS) \
 	$(SPECS)
 RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 
@@ -58,6 +59,9 @@ rpm: fedora centos ## build all rpm packages
 .PHONY: fedora
 fedora: $(FEDORA_RELEASES) ## build all fedora rpm packages
 
+.PHONY: centos-8
+centos-8: RPMBUILD_EXTRA_FLAGS=--define '_without_btrfs 1'
+
 .PHONY: centos
 centos: $(CENTOS_RELEASES) ## build all centos rpm packages
 

components/packaging/rpm/SPECS/docker-ce.spec

@@ -1,5 +1,7 @@
 %global debug_package %{nil}
 
+# BTRFS is enabled by default, but can be disabled by defining _without_btrfs
+%{!?_with_btrfs: %{!?_without_btrfs: %define _with_btrfs 1}}
 
 Name: docker-ce
 Version: %{_version}
@@ -33,7 +35,7 @@ Requires: xz
 Requires: device-mapper-libs >= 1.02.90-1
 
 BuildRequires: bash
-BuildRequires: btrfs-progs-devel
+%{?_with_btrfs:BuildRequires: btrfs-progs-devel}
 BuildRequires: ca-certificates
 BuildRequires: cmake
 BuildRequires: device-mapper-devel
@@ -83,7 +85,7 @@ export DOCKER_GITCOMMIT=%{_gitcommit}
 mkdir -p /go/src/github.com/docker
 ln -s /root/rpmbuild/BUILD/src/engine /go/src/github.com/docker/docker
 
-pushd engine
+pushd /root/rpmbuild/BUILD/src/engine
 for component in tini "proxy dynamic";do
     TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
 done

components/packaging/rpm/centos-8/Dockerfile

@@ -11,15 +11,16 @@ ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
+ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
 ENV SUITE=${SUITE}
-RUN yum install -y rpm-build rpmlint
+RUN yum install -y rpm-build rpmlint yum-utils
+RUN yum-config-manager --set-enabled PowerTools
 COPY SPECS /root/rpmbuild/SPECS
-RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
+RUN yum-builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/*.spec
 COPY --from=golang /usr/local/go /usr/local/go
 WORKDIR /root/rpmbuild
 ENTRYPOINT ["/bin/rpmbuild"]