Skip to content

Commit e25a59b

Browse files
committed
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 <[email protected]>
1 parent 7ada8de commit e25a59b

File tree

3 files changed

+53
-1
lines changed

3 files changed

+53
-1
lines changed

utils/tini/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=tini
44
PKG_VERSION:=0.19.0
5-
PKG_RELEASE:=3
5+
PKG_RELEASE:=4
66

77
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=https://codeload.github.com/krallin/tini/tar.gz/v${PKG_VERSION}?
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 41685c0ade9793a6ca51ad9f908f92ea5bbb49a9 Mon Sep 17 00:00:00 2001
2+
From: Bjorn Neergaard <[email protected]>
3+
Date: Fri, 27 Jan 2023 08:07:51 -0700
4+
Subject: [PATCH 1/2] chore: bump minimum CMake to 2.8.12
5+
6+
This is both the last version supported by current CMake, and the
7+
version in use on Enterprise Linux 7.
8+
9+
Signed-off-by: Bjorn Neergaard <[email protected]>
10+
---
11+
CMakeLists.txt | 2 +-
12+
1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+
--- a/CMakeLists.txt
15+
+++ b/CMakeLists.txt
16+
@@ -1,4 +1,4 @@
17+
-cmake_minimum_required (VERSION 2.8.0)
18+
+cmake_minimum_required (VERSION 2.8.12)
19+
project (tini C)
20+
21+
# Config
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 32e503365205cac479ad2110d72d18b2072fd93c Mon Sep 17 00:00:00 2001
2+
From: Rudi Heitbaum <[email protected]>
3+
Date: Fri, 28 Mar 2025 19:10:02 +1100
4+
Subject: [PATCH 2/2] chore: allow CMake though to 3.10
5+
6+
This is allows the build with cmake-4.0.0 without deprecation warnings.
7+
8+
use min...max syntax to allow build with newer cmake.
9+
ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
10+
11+
Fixes:
12+
CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
13+
Compatibility with CMake < 3.5 has been removed from CMake.
14+
15+
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
16+
to tell CMake that the project requires at least <min> but has been updated
17+
to work with policies introduced by <max> or earlier.
18+
19+
Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
20+
---
21+
CMakeLists.txt | 2 +-
22+
1 file changed, 1 insertion(+), 1 deletion(-)
23+
24+
--- a/CMakeLists.txt
25+
+++ b/CMakeLists.txt
26+
@@ -1,4 +1,4 @@
27+
-cmake_minimum_required (VERSION 2.8.12)
28+
+cmake_minimum_required (VERSION 2.8.12...3.10)
29+
project (tini C)
30+
31+
# Config

0 commit comments

Comments
 (0)