pkg(docker-engine): remove btrfs dependencies

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Jan 21, 2023 · 5a8be54 · 5a8be54
1 parent 15bb8a5
commit 5a8be54
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
@@ -153,14 +153,7 @@ RUN <<EOT
     exit 1
   fi
   set -x
-  case "$PKG_RELEASE" in
-    centos8|centos9|oraclelinux*)
-      $builddepCmd --define '_without_btrfs 1' -y /root/rpmbuild/SPECS/*.spec
-      ;;
-    *)
-      $builddepCmd -y /root/rpmbuild/SPECS/*.spec
-      ;;
-  esac
+  $builddepCmd -y /root/rpmbuild/SPECS/*.spec
 EOT
 WORKDIR /root/rpmbuild
 ARG DOCKER_ENGINE_REF
@@ -206,7 +199,7 @@ ARG DOCKER_ENGINE_REF
 ARG NIGHTLY_BUILD
 WORKDIR /build
 ARG TARGETPLATFORM
-RUN xx-apt-get install -y gcc libc6-dev libapparmor-dev libbtrfs-dev libdevmapper-dev libltdl-dev libseccomp-dev libsecret-1-dev libsystemd-dev libudev-dev pkg-config
+RUN xx-apt-get install -y gcc libc6-dev libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsecret-1-dev libsystemd-dev libudev-dev pkg-config
 RUN --mount=type=bind,source=scripts/pkg-static-build.sh,target=/usr/local/bin/pkg-static-build \
     --mount=type=bind,from=common-scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
     --mount=type=bind,from=common-scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \

diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control
@@ -11,7 +11,6 @@ Build-Depends: ca-certificates,
                dh-apparmor,
                debhelper (>= 10~) | dh-systemd,
                gcc,
-               libbtrfs-dev | btrfs-tools,
                libc-dev,
                libdevmapper-dev,
                libltdl-dev,

diff --git a/pkg/docker-engine/rpm/docker-ce.spec b/pkg/docker-engine/rpm/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}
@@ -35,7 +30,6 @@ Requires: tar
 Requires: xz
 
 BuildRequires: bash
-%{?_with_btrfs:BuildRequires: btrfs-progs-devel}
 BuildRequires: ca-certificates
 BuildRequires: cmake
 BuildRequires: device-mapper-devel

diff --git a/pkg/docker-engine/scripts/pkg-rpm-build.sh b/pkg/docker-engine/scripts/pkg-rpm-build.sh
@@ -66,13 +66,6 @@ if [ -n "$(xx-info variant)" ]; then
   pkgoutput="${pkgoutput}/$(xx-info variant)"
 fi
 
-case "$PKG_RELEASE" in
-  centos7|centos8|centos9|oraclelinux*)
-    rpmDefine+=(--define "_without_btrfs 1")
-    export DOCKER_BUILDTAGS="exclude_graphdriver_btrfs $DOCKER_BUILDTAGS"
-    ;;
-esac
-
 set -x
 
 rpmbuild --target $(xx-info rhel-arch) $PKG_RPM_BUILDFLAGS "${rpmDefine[@]}" /root/rpmbuild/SPECS/*.spec