[PATCH v2 1/7] libuv: enable nativesdk builds

[PATCH v2 1/7] libuv: enable nativesdk builds

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/libuv/libuv_1.51.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/libuv/libuv_1.51.0.bb b/meta/recipes-connectivity/libuv/libuv_1.51.0.bb
index 9ff9cf35e2e..afc1bf87b5e 100644
--- a/meta/recipes-connectivity/libuv/libuv_1.51.0.bb
+++ b/meta/recipes-connectivity/libuv/libuv_1.51.0.bb
@@ -17,4 +17,4 @@ do_configure() {
     oe_runconf
 }
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
2.43.0

[PATCH v2 2/7] cmake: remove obsolete variable assignments

[Ross Burton]

Remove obsolete assignments:

- KWSYS_CHAR_IS_SIGNED was removed in 3.5.0[1]
- KWSYS_LFS_WORKS was removed in 3.15.0[2]

[1] cmake ec1398d7ae ("KWSys 2015-12-14 (c1149ef6)")
[2] cmake 11fe7c9063 ("KWSys 2019-02-25 (833b2470)")

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/cmake/cmake_4.2.3.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
index cfc5cb1b938..7c3dda2b157 100644
--- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
@@ -40,9 +40,7 @@ EXTRA_OECMAKE = " \
     -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
-    -DKWSYS_CHAR_IS_SIGNED=1 \
     -DBUILD_CursesDialog=0 \
-    -DKWSYS_LFS_WORKS=1 \
 "
 
 PACKAGECONFIG ??= ""
-- 
2.43.0

[PATCH v2 3/7] cmake: clean up variables shared between .bb and .inc

[Ross Burton]

Use EXTRA_OECMAKE in the non-cmake-inheriting cmake-native recipe, so
that the cmake.inc can assign once.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/cmake/cmake-native_4.2.3.bb | 4 ++--
 meta/recipes-devtools/cmake/cmake_4.2.3.bb        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
index 128fef8a6e7..299cb4d1ea6 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM:append = " \
 B = "${WORKDIR}/build"
 do_configure[cleandirs] = "${B}"
 
-CMAKE_EXTRACONF = "\
+EXTRA_OECMAKE += "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
     -DBUILD_CursesDialog=1 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
@@ -41,7 +41,7 @@ do_configure () {
 	${S}/bootstrap --verbose --prefix=${prefix} \
 		${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \
 		${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \
-		-- ${CMAKE_EXTRACONF}
+		-- ${EXTRA_OECMAKE}
 }
 
 do_compile() {
diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
index 7c3dda2b157..233ceeae153 100644
--- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
@@ -33,7 +33,7 @@ python () {
     d.setVar("docdir_stripped", docdir_stripped)
 }
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE += " \
     -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
-- 
2.43.0

[PATCH v2 4/7] cmake: consolidate CMAKE_USE_SYSTEM_LIBRARIES

[Ross Burton]

Move CMAKE_USE_SYSTEM_LIBRARIES=1 to cmake.inc so that all builds use
system libraries unless told otherwise.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/cmake/cmake-native_4.2.3.bb | 1 -
 meta/recipes-devtools/cmake/cmake.inc             | 2 ++
 meta/recipes-devtools/cmake/cmake_4.2.3.bb        | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
index 299cb4d1ea6..0845be49e57 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
@@ -25,7 +25,6 @@ do_configure[cleandirs] = "${B}"
 EXTRA_OECMAKE += "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
     -DBUILD_CursesDialog=1 \
-    -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 5b8c1922b18..1b84c785d03 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -24,3 +24,5 @@ SRC_URI[sha256sum] = "7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
 CVE_STATUS[CVE-2016-10642] = "cpe-incorrect: This is specific to the npm package that installs cmake, so isn't relevant to OpenEmbedded"
+
+EXTRA_OECMAKE += "-DCMAKE_USE_SYSTEM_LIBRARIES=1"
\ No newline at end of file
diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
index 233ceeae153..cf559d764a0 100644
--- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
@@ -35,7 +35,6 @@ python () {
 
 EXTRA_OECMAKE += " \
     -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
-    -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
-- 
2.43.0

[PATCH v2 5/7] cmake: use system libuv

[Ross Burton]

We have a recipe for libuv in oe-core, so use it in the target recipe to
avoid vendoring in more code.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/cmake/cmake_4.2.3.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
index cf559d764a0..e6abc06c85c 100644
--- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb
@@ -2,7 +2,7 @@ require cmake.inc
 
 inherit cmake bash-completion
 
-DEPENDS += "curl expat zlib libarchive xz ncurses bzip2"
+DEPENDS += "curl expat zlib libarchive xz ncurses bzip2 libuv"
 
 SRC_URI:append:class-nativesdk = " \
     file://OEToolchainConfig.cmake \
@@ -15,7 +15,6 @@ LICENSE:append = " & BSD-1-Clause & MIT"
 LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
     file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
-    file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
 "
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
@@ -37,7 +36,6 @@ EXTRA_OECMAKE += " \
     -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \
-    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
     -DBUILD_CursesDialog=0 \
 "
-- 
2.43.0

[PATCH v2 6/7] cmake: add license information for vendored cppdap library

[Ross Burton]

Add missing license information for the vendored cppdap library that we
don't yet have a recipe for.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/cmake/cmake-native_4.2.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
index 0845be49e57..a4d53274381 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
@@ -9,7 +9,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \
             file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \
             "
 
-LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl"
+LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl & Apache-2.0"
 LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
     file://Utilities/cmlibarchive/COPYING;md5=7ce08437ff7f5e24d72e666313ae4084 \
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
     file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
     file://Utilities/cmcurl/COPYING;md5=72f4e9890e99e68d77b7e40703d789b8 \
+    file://Utilities/cmcppdap/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
 B = "${WORKDIR}/build"
-- 
2.43.0

[PATCH v2 7/7] cmake: remove obsolete patches

[Ross Burton]

0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch can be
replaced with two variable assignments to seed the results we want.

0002-CMakeLists.txt-disable-USE_NGHTTP2.patch is not needed anymore as
the vendored curl will disable the use of nghttp2 automatically if it
isn't found.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../cmake/cmake-native_4.2.3.bb               |  5 ++-
 ...ext2fs-ext2_fs.h-by-cmake-s-internal.patch | 38 -------------------
 ...2-CMakeLists.txt-disable-USE_NGHTTP2.patch | 36 ------------------
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
index a4d53274381..cf800d48543 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb
@@ -5,8 +5,6 @@ DEPENDS += "bzip2-replacement-native xz-native zlib-native ncurses-native zstd-n
 
 SRC_URI += "file://OEToolchainConfig.cmake \
             file://environment.d-cmake.sh \
-            file://0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch \
-            file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \
             "
 
 LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl & Apache-2.0"
@@ -37,6 +35,9 @@ EXTRA_OECMAKE += "\
     -DHAVE_SYS_ACL_H=0 \
 "
 
+# Ensure e2fsprogs isn't found on the host to remove a build dependency and reproducible builds.
+EXTRA_OECMAKE += "-DHAVE_EXT2FS_EXT2_FS_H=0 -DHAVE_WORKING_EXT2_IOC_GETFLAGS=0"
+
 do_configure () {
 	${S}/bootstrap --verbose --prefix=${prefix} \
 		${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \
diff --git a/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
deleted file mode 100644
index 7a717f72d80..00000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d3859840c134012b18e3bca7e4bab60c9bc8efd5 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 5 Jul 2018 10:28:04 -0300
-Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
-
- libarchive copy
-Organization: O.S. Systems Software LTDA.
-
-We don't want to add a dependency on e2fsprogs-native for cmake-native,
-and we don't use CPack so just disable this functionality.
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- Utilities/cmlibarchive/CMakeLists.txt | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
-index 9957052d..71a7aeb5 100644
---- a/Utilities/cmlibarchive/CMakeLists.txt
-+++ b/Utilities/cmlibarchive/CMakeLists.txt
-@@ -734,12 +734,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
- LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
- LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
- LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
--LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
--
--CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
--#include <ext2fs/ext2_fs.h>
--int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
--
-+SET(HAVE_EXT2FS_EXT2_FS_H 0)
-+SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0)
- LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
- LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H)
- LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
diff --git a/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch
deleted file mode 100644
index c03e5e2364a..00000000000
--- a/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 811ad63aeff08fb6308203989f6cc664d00a2fa9 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 28 Dec 2022 17:51:27 +0800
-Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
-
-nghttp2 depends on cmake-native to build, to break circular
-dependency, disable nghttp2.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-Adjust the patch to apply on top of v3.28.3.
-
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
-
-Adjust the patch to apply on top of v3.30.1.
-
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
----
- Utilities/cmcurl/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
-index 63d3a4f5..ab5f1c50 100644
---- a/Utilities/cmcurl/CMakeLists.txt
-+++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -109,7 +109,7 @@ set(USE_ECH OFF)
- set(USE_HTTPSRR OFF)
- set(USE_LIBIDN2 ON)
- set(USE_LIBRTMP OFF)
--set(USE_NGHTTP2 ON)
-+set(USE_NGHTTP2 OFF)
- set(USE_NGTCP2 OFF)
- set(USE_OPENSSL_QUIC OFF)
- set(USE_QUICHE OFF)
-- 
2.43.0

Patchtest results for [PATCH v2 1/7] libuv: enable nativesdk builds

[patchtest]

[-- Attachment #1: Type: text/plain, Size: 2188 bytes --]

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/v2-1-7-libuv-enable-nativesdk-builds.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!