From bcdf0c746dc625bc76411194c9609ee4ab425436 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 6 Mar 2025 18:43:41 +0800 Subject: [PATCH] build with cmake 4.0 --- 2002-tini-port-to-newer-cmake.patch | 10 ++++++++++ moby.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 2002-tini-port-to-newer-cmake.patch diff --git a/2002-tini-port-to-newer-cmake.patch b/2002-tini-port-to-newer-cmake.patch new file mode 100644 index 0000000..15a5505 --- /dev/null +++ b/2002-tini-port-to-newer-cmake.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca0209b..3e47932 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.8.0) ++cmake_minimum_required (VERSION 2.8.0...${CMAKE_VERSION}) + project (tini C) + + # Config diff --git a/moby.spec b/moby.spec index 65054d1..5fd5e2e 100644 --- a/moby.spec +++ b/moby.spec @@ -8,7 +8,7 @@ Name: moby Version: 25.0.7 -Release: 2 +Release: 3 Summary: The open-source application container engine License: Apache-2.0 URL: https://www.docker.com @@ -30,6 +30,7 @@ Patch1004: 1004-fix-docker-swarm-run-failed-for-loongarch64.patch Patch1006: 1006-fix-libnetwork-osl-test-TestAddRemoveInterface.patch # Patch 2001-2999 for tini Patch2001: 2001-tini.c-a-function-declaration-without-a-prototype-is.patch +Patch2002: 2002-tini-port-to-newer-cmake.patch Requires(meta): %{name}-engine = %{version}-%{release} Requires(meta): %{name}-client = %{version}-%{release} @@ -219,6 +220,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Mar 06 2025 Funda Wang - 25.0.7-3 +- build with cmake 4.0 + * Mon Jan 20 2025 Funda Wang - 25.0.7-2 - backport cli v26.1.0 patch to fix riscv64 build error -- Gitee