tini: Fix build error with CMake 4+
PATCH 1/1 tini: Fix build error with CMake 4+
From: Ryosuke Saito <[email protected]>
Backport patches from https://github.com/krallin/tini to resolve the build error with CMake 4.0 and later.
- 0001-chore-bump-minimum-CMake-to-2.8.12.patch
- 0001-chore-allow-CMake-though-to-3.10.patch
--- ...001-chore-allow-CMake-though-to-3.10.patch | 39 +++++++++++++++++++ ...1-chore-bump-minimum-CMake-to-2.8.12.patch | 29 ++++++++++++++ recipes-containers/tini/tini_0.19.0.bb | 2 + 3 files changed, 70 insertions(+) create mode 100644 recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch create mode 100644 recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +39 -0
@@ -0,0 +1,39 @@ +From bb775aa14cc5072cf687fd7f4edd44df62c06b1d Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +Date: Fri, 28 Mar 2025 19:10:02 +1100 +Subject: [PATCH] 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 <min> value. Or, use the <min>...<max> syntax + to tell CMake that the project requires at least <min> but has been updated + to work with policies introduced by <max> or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/071c715e376e9ee0ac1a196fe8c38bcb61ad385c] +Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b06fc13f31d..2e5390b84967 100644 +--- 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 +-- +2.34.1 +
recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0a5449a61b64938354db6efae8465d530d824d37 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <[email protected]> +Date: Fri, 27 Jan 2023 08:07:51 -0700 +Subject: [PATCH] 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 <[email protected]> + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/0b44d3665869e46ccbac7414241b8256d6234dc4] +Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a6cab12fc25..9b06fc13f31d 100644 +--- 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 +-- +2.34.1 +
recipes-containers/tini/tini_0.19.0.bb +2 -0
@@ -10,6 +10,8 @@ SRC_URI = " \ file://0001-Do-not-strip-the-output-binary-allow-yocto-to-do-thi.patch \ file://0001-tini.c-a-function-declaration-without-a-prototype-is.patch \ file://0001-Support-POSIX-basename-from-musl-libc.patch \ + file://0001-chore-bump-minimum-CMake-to-2.8.12.patch \ + file://0001-chore-allow-CMake-though-to-3.10.patch \ " LICENSE = "MIT"
Signature · 1 line
2.50.0
Rather than stacking more backports onto the recipe, I've just bumped to -tip (I'm doing more package uprev's anyway), and I'm now able to build with the OE CMake bump.
Bruce
In message: [meta-virtualization][PATCH] tini: Fix build error with CMake 4+
Quoted 123 lines · on 18/07/2025 Ryosuke Saito via lists.yoctoproject.org wrote:
From: Ryosuke Saito <[email protected]>
Backport patches from https://github.com/krallin/tini to resolve the build error with CMake 4.0 and later.
- 0001-chore-bump-minimum-CMake-to-2.8.12.patch
- 0001-chore-allow-CMake-though-to-3.10.patchSigned-off-by Ryosuke Saito <[email protected]>--- ...001-chore-allow-CMake-though-to-3.10.patch | 39 +++++++++++++++++++ ...1-chore-bump-minimum-CMake-to-2.8.12.patch | 29 ++++++++++++++ recipes-containers/tini/tini_0.19.0.bb | 2 + 3 files changed, 70 insertions(+) create mode 100644 recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch create mode 100644 recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patchrecipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +39
-0@@ -0,0 +1,39 @@ +From bb775aa14cc5072cf687fd7f4edd44df62c06b1d Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +Date: Fri, 28 Mar 2025 19:10:02 +1100 +Subject: [PATCH] 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 <min> value. Or, use the <min>...<max> syntax + to tell CMake that the project requires at least <min> but has been updated + to work with policies introduced by <max> or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/071c715e376e9ee0ac1a196fe8c38bcb61ad385c] +Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b06fc13f31d..2e5390b84967 100644 +--- 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 +-- +2.34.1 +recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch new file +29
-0@@ -0,0 +1,29 @@ +From 0a5449a61b64938354db6efae8465d530d824d37 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <[email protected]> +Date: Fri, 27 Jan 2023 08:07:51 -0700 +Subject: [PATCH] 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 <[email protected]> + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/0b44d3665869e46ccbac7414241b8256d6234dc4] +Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a6cab12fc25..9b06fc13f31d 100644 +--- 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 +-- +2.34.1 +recipes-containers/tini/tini_0.19.0.bb +2
-0@@ -10,6 +10,8 @@ SRC_URI = " \ file://0001-Do-not-strip-the-output-binary-allow-yocto-to-do-thi.patch \ file://0001-tini.c-a-function-declaration-without-a-prototype-is.patch \ file://0001-Support-POSIX-basename-from-musl-libc.patch \ + file://0001-chore-bump-minimum-CMake-to-2.8.12.patch \ + file://0001-chore-allow-CMake-though-to-3.10.patch \ " LICENSE = "MIT"Signature · 11 lines
2.50.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9321): https://lists.yoctoproject.org/g/meta-virtualization/message/9321 Mute This Topic: https://lists.yoctoproject.org/mt/114218116/1050810 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
That's fine with me, thanks!
Ryosuke
Quoted 155 lines · On Mon, Jul 21, 2025, 11:34 Bruce Ashfield <[email protected]> wrote:
Rather than stacking more backports onto the recipe, I've just bumped to -tip (I'm doing more package uprev's anyway), and I'm now able to build with the OE CMake bump.
Bruce
In message: [meta-virtualization][PATCH] tini: Fix build error with CMake 4+
Quoted 8 lines · on 18/07/2025 Ryosuke Saito via lists.yoctoproject.org wrote:
From: Ryosuke Saito <[email protected]>
Backport patches from https://github.com/krallin/tini to resolve the build error with CMake 4.0 and later.
- 0001-chore-bump-minimum-CMake-to-2.8.12.patch
- 0001-chore-allow-CMake-though-to-3.10.patchQuoted 7 lines
Signed-off-by Ryosuke Saito <[email protected]>--- ...001-chore-allow-CMake-though-to-3.10.patch | 39 +++++++++++++++++++ ...1-chore-bump-minimum-CMake-to-2.8.12.patch | 29 ++++++++++++++ recipes-containers/tini/tini_0.19.0.bb | 2 + 3 files changed, 70 insertions(+) create mode 100644
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patchQuoted 1 line
create mode 100644
recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patchQuoted 2 lines
diff --git
a/recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patchb/recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patchQuoted 4 lines
new file mode 100644
index 000000000000..faea9fb647f9
---/dev/null
+++
b/recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patchrecipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch line 9
Quoted 10 lines
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +9
-0@@ -0,0 +1,39 @@ +From bb775aa14cc5072cf687fd7f4edd44df62c06b1d Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +Date: Fri, 28 Mar 2025 19:10:02 +1100 +Subject: [PATCH] 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
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch
Quoted 6 lines
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +6
-0+ +Fixes: +CMake Error at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument <min> value. Or, use the <min>...<max>syntax
Review line 16
Quoted 1 line
(quoted diff) +1
-0+ to tell CMake that the project requires at least <min> but has beenupdated
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch
Quoted 5 lines
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +5
-0+ to work with policies introduced by <max> or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/071c715e376e9ee0ac1a196fe8c38bcb61ad385c
]Quoted 18 lines
recipes-containers/tini/tini/0001-chore-allow-CMake-though-to-3.10.patch new file +18
-0+Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b06fc13f31d..2e5390b84967 100644 +--- 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 +-- +2.34.1 +Quoted 1 line
diff --git
a/recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patchb/recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patchQuoted 4 lines
new file mode 100644
index 000000000000..ec03f7ff16b2
---/dev/null
+++
b/recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patchrecipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch line 11
Quoted 12 lines
recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch new file +11
-0@@ -0,0 +1,29 @@ +From 0a5449a61b64938354db6efae8465d530d824d37 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <[email protected]> +Date: Fri, 27 Jan 2023 08:07:51 -0700 +Subject: [PATCH] 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 <[email protected]> + +Upstream-Status: Backport [https://github.com/krallin/tini/commit/0b44d3665869e46ccbac7414241b8256d6234dc4
]Review
Quoted 19 lines
recipes-containers/tini/tini/0001-chore-bump-minimum-CMake-to-2.8.12.patch new file +18
-0+Signed-off-by: Ryosuke Saito <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a6cab12fc25..9b06fc13f31d 100644 +--- 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 +-- +2.34.1 +(quoted diff) +0
-0b/recipes-containers/tini/tini_0.19.0.bb
recipes-containers/tini/tini_0.19.0.bb SRC_URI = " \ · line 10
Quoted 5 lines
index
c3ca25d07a4a..9eed4a646cba100644recipes-containers/tini/tini_0.19.0.bb +0
-0@@ -10,6 +10,8 @@ SRC_URI = " \file://0001-Do-not-strip-the-output-binary-allow-yocto-to-do-thi.patch \
Quoted 1 line
file://0001-tini.c-a-function-declaration-without-a-prototype-is.patch \
Quoted 11 lines
file://0001-Support-POSIX-basename-from-musl-libc.patch \recipes-containers/tini/tini_0.19.0.bb +2
-1+ file://0001-chore-bump-minimum-CMake-to-2.8.12.patch \ + file://0001-chore-allow-CMake-though-to-3.10.patch \ " LICENSE = "MIT" --2.50.0
Quoted 3 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#9321):https://lists.yoctoproject.org/g/meta-virtualization/message/9321
Quoted 3 lines
Mute This Topic: https://lists.yoctoproject.org/mt/114218116/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsubQuoted 2 lines
-=-=-=-=-=-=-=-=-=-=-=-