From 579aab665eca302dd65dcb04699597aa30c838cc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 26 Dec 2024 13:30:38 +0100 Subject: [PATCH 1/2] remove libarchive build-dep (was: fix missing archive_write_add_filter_zstd) This reverts commit 78242140d7f85863e8a8e3a133f3ebf73b9596ca. That change was added to fix a missing archive_write_add_filter_zstd when compiling tini, but it's no longer needed; > Add libarchive build-dep to fix missing archive_write_add_filter_zstd > > Trying to fix > > + echo 'Install tini version de40ad007797e0dcd8b7126f27bb87401d224240' > + git clone https://github.com/krallin/tini.git /go/tini > Install tini version de40ad007797e0dcd8b7126f27bb87401d224240 > Cloning into '/go/tini'... > + cd /go/tini > + git checkout -q de40ad007797e0dcd8b7126f27bb87401d224240 > + cmake . > cmake: symbol lookup error: cmake: undefined symbol: archive_write_add_filter_zstd > error: Bad exit status from /var/tmp/rpm-tmp.Dl5CDf (%build) > > According to https://bugs.centos.org/view.php?id=18212, upgrading to libarchive-3.3.3-1.el8.x86_64 > should resolve the problem. Signed-off-by: Sebastiaan van Stijn --- rpm/SPECS/docker-ce.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec index 156714adca..383660b49b 100644 --- a/rpm/SPECS/docker-ce.spec +++ b/rpm/SPECS/docker-ce.spec @@ -34,7 +34,6 @@ BuildRequires: cmake BuildRequires: gcc BuildRequires: git BuildRequires: glibc-static -BuildRequires: libarchive BuildRequires: libtool BuildRequires: libtool-ltdl-devel BuildRequires: make From ddf1042427f3d8b853b1cbcac4f569bdedb64241 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 2 Apr 2024 15:40:18 -0600 Subject: [PATCH 2/2] rpm: drop unnecessary "which" build-dep Signed-off-by: Bjorn Neergaard --- rpm/SPECS/docker-ce.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec index 383660b49b..254a190748 100644 --- a/rpm/SPECS/docker-ce.spec +++ b/rpm/SPECS/docker-ce.spec @@ -41,7 +41,6 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(systemd) BuildRequires: systemd-devel BuildRequires: tar -BuildRequires: which # conflicting packages Conflicts: docker