Merge pull request #830 from thaJeztah/remove_btrfs_headers

[master] remove libbtrfs-dev, btrfs-tools, btrfs-progs-devel build-dependencies

deb/common/control

@@ -10,7 +10,6 @@ Build-Depends: bash,
                debhelper (>= 10~) | dh-systemd,
                gcc,
                git,
-               libbtrfs-dev | btrfs-tools,
                libc-dev,
                libdevmapper-dev,
                libltdl-dev,

rpm/Makefile

@@ -85,9 +85,6 @@ rpm: fedora centos ## build all rpm packages
 .PHONY: fedora
 fedora: $(FEDORA_RELEASES) ## build all fedora rpm packages
 
-.PHONY: centos-8 centos-9
-centos-8 centos-9: RPMBUILD_EXTRA_FLAGS=--define '_without_btrfs 1'
-
 .PHONY: centos
 centos: $(CENTOS_RELEASES) ## build all centos rpm packages
 

rpm/SPECS/docker-ce.spec

@@ -1,10 +1,5 @@
 %global debug_package %{nil}
 
-# BTRFS is enabled by default, but can be disabled by defining _without_btrfs
-%if %{undefined _with_btrfs} && %{undefined _without_btrfs}
-%define _with_btrfs 1
-%endif
-
 Name: docker-ce
 Version: %{_version}
 Release: %{_release}%{?dist}
@@ -33,7 +28,6 @@ Requires: tar
 Requires: xz
 
 BuildRequires: bash
-%{?_with_btrfs:BuildRequires: btrfs-progs-devel}
 BuildRequires: ca-certificates
 BuildRequires: cmake
 BuildRequires: device-mapper-devel

rpm/centos-8/Dockerfile

@@ -34,10 +34,10 @@ COPY SPECS /root/rpmbuild/SPECS
 # TODO change once we support scan-plugin on other architectures
 RUN \
   if [ "$(uname -m)" = "x86_64" ]; then \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/*.spec; \
   else \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/docker-c*.spec; \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/docker-b*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/docker-c*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/docker-b*.spec; \
   fi
 
 COPY --from=golang /usr/local/go /usr/local/go

rpm/centos-9/Dockerfile

@@ -30,10 +30,10 @@ COPY SPECS /root/rpmbuild/SPECS
 # TODO change once we support scan-plugin on other architectures
 RUN \
   if [ "$(uname -m)" = "x86_64" ]; then \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/*.spec; \
   else \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/docker-c*.spec; \
-    dnf builddep --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/docker-b*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/docker-c*.spec; \
+    dnf builddep -y /root/rpmbuild/SPECS/docker-b*.spec; \
   fi
 
 COPY --from=golang /usr/local/go /usr/local/go