From d29215e6b8a2b0a1f6e9c8b3236377128f1d13cd Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Sat, 8 Nov 2025 20:22:04 +0100 Subject: [PATCH] tini: add patches for minimal cmake version "2.8.12...3.10" This change adds backport patches from upstream to increase the minimal required cmake version from "2.8.0" to "2.8.12...3.10". Signed-off-by: Albrecht Lohofener --- utils/tini/Makefile | 2 +- ...3-chore-bump-minimum-CMake-to-2.8.12.patch | 21 +++++++++++++ ...004-chore-allow-CMake-though-to-3.10.patch | 31 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 utils/tini/patches/003-chore-bump-minimum-CMake-to-2.8.12.patch create mode 100644 utils/tini/patches/004-chore-allow-CMake-though-to-3.10.patch diff --git a/utils/tini/Makefile b/utils/tini/Makefile index 8b1aa97be3..f00d1d3764 100644 --- a/utils/tini/Makefile +++ b/utils/tini/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tini PKG_VERSION:=0.19.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/krallin/tini/tar.gz/v${PKG_VERSION}? diff --git a/utils/tini/patches/003-chore-bump-minimum-CMake-to-2.8.12.patch b/utils/tini/patches/003-chore-bump-minimum-CMake-to-2.8.12.patch new file mode 100644 index 0000000000..0ecb9adb83 --- /dev/null +++ b/utils/tini/patches/003-chore-bump-minimum-CMake-to-2.8.12.patch @@ -0,0 +1,21 @@ +From 41685c0ade9793a6ca51ad9f908f92ea5bbb49a9 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard +Date: Fri, 27 Jan 2023 08:07:51 -0700 +Subject: [PATCH 1/2] chore: bump minimum CMake to 2.8.12 + +This is both the last version supported by current CMake, and the +version in use on Enterprise Linux 7. + +Signed-off-by: Bjorn Neergaard +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.8.0) ++cmake_minimum_required (VERSION 2.8.12) + project (tini C) + + # Config diff --git a/utils/tini/patches/004-chore-allow-CMake-though-to-3.10.patch b/utils/tini/patches/004-chore-allow-CMake-though-to-3.10.patch new file mode 100644 index 0000000000..03c21d3745 --- /dev/null +++ b/utils/tini/patches/004-chore-allow-CMake-though-to-3.10.patch @@ -0,0 +1,31 @@ +From 32e503365205cac479ad2110d72d18b2072fd93c Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 28 Mar 2025 19:10:02 +1100 +Subject: [PATCH 2/2] chore: allow CMake though to 3.10 + +This is allows the build with cmake-4.0.0 without deprecation warnings. + +use min...max syntax to allow build with newer cmake. +ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html + +Fixes: +CMake Error at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.8.12) ++cmake_minimum_required (VERSION 2.8.12...3.10) + project (tini C) + + # Config