Forgot to squash the fix in. I sent a v2. Alex
On Mon, 27 May 2024 at 22:45, Alexandre Belloni <[email protected]> wrote: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/9373/steps/13/logs/stdio > > On 27/05/2024 20:12:06+0200, Alexander Kanavin wrote: > > From: Alexander Kanavin <[email protected]> > > > > License-update: copyright years > > > > Signed-off-by: Alexander Kanavin <[email protected]> > > --- > > .../{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} | 0 > > meta/recipes-devtools/cmake/cmake.inc | 4 ++-- > > .../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 9 +++------ > > ...le-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 9 ++++----- > > .../cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} | 0 > > 5 files changed, 9 insertions(+), 13 deletions(-) > > rename meta/recipes-devtools/cmake/{cmake-native_3.28.3.bb => > > cmake-native_3.29.3.bb} (100%) > > rename meta/recipes-devtools/cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} > > (100%) > > > > diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb > > b/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb > > similarity index 100% > > rename from meta/recipes-devtools/cmake/cmake-native_3.28.3.bb > > rename to meta/recipes-devtools/cmake/cmake-native_3.29.3.bb > > diff --git a/meta/recipes-devtools/cmake/cmake.inc > > b/meta/recipes-devtools/cmake/cmake.inc > > index ab9f459c05c..1155c1bbe0a 100644 > > --- a/meta/recipes-devtools/cmake/cmake.inc > > +++ b/meta/recipes-devtools/cmake/cmake.inc > > @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/"; > > BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"; > > SECTION = "console/utils" > > LICENSE = "BSD-3-Clause" > > -LIC_FILES_CHKSUM = > > "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ > > +LIC_FILES_CHKSUM = > > "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ > > > > file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b > > \ > > " > > > > @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = > > "${@'.'.join(d.getVar('PV').split('.')[0:2])}" > > SRC_URI = > > "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ > > " > > > > -SRC_URI[sha256sum] = > > "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" > > +SRC_URI[sha256sum] = > > "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" > > > > UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" > > > > diff --git > > a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > > > > b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > > index b2933d88be9..b7ec3e7bacb 100644 > > --- > > a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > > +++ > > b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > > @@ -1,4 +1,4 @@ > > -From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 > > +From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 > > From: Changqing Li <[email protected]> > > Date: Wed, 28 Dec 2022 17:51:27 +0800 > > Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 > > @@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <[email protected]> > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Utilities/cmcurl/CMakeLists.txt > > b/Utilities/cmcurl/CMakeLists.txt > > -index 9387247366..d3de01f4e8 100644 > > +index 3dd24f1e..4a0f6773 100644 > > --- a/Utilities/cmcurl/CMakeLists.txt > > +++ b/Utilities/cmcurl/CMakeLists.txt > > -@@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") > > +@@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") > > set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") > > set(SHARE_LIB_OBJECT OFF) > > set(USE_LIBIDN2 ON) > > @@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 > > set(USE_NGTCP2 OFF) > > set(USE_QUICHE OFF) > > set(USE_WIN32_IDN OFF) > > --- > > -2.43.0 > > - > > diff --git > > a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > > > > b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > > index d6f7308fe0c..af164084d03 100644 > > --- > > a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > > +++ > > b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > > @@ -1,4 +1,4 @@ > > -From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 > > +From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 > > From: Otavio Salvador <[email protected]> > > Date: Thu, 5 Jul 2018 10:28:04 -0300 > > Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal > > @@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] > > > > Signed-off-by: Paul Eggleton <[email protected]> > > Signed-off-by: Otavio Salvador <[email protected]> > > - > > --- > > 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 bfcaf30..2960683 100644 > > +index e47184b7..e4964c32 100644 > > --- a/Utilities/cmlibarchive/CMakeLists.txt > > +++ b/Utilities/cmlibarchive/CMakeLists.txt > > -@@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) > > +@@ -721,12 +721,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) > > @@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 > > +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) > > - LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) > > diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb > > b/meta/recipes-devtools/cmake/cmake_3.29.3.bb > > similarity index 100% > > rename from meta/recipes-devtools/cmake/cmake_3.28.3.bb > > rename to meta/recipes-devtools/cmake/cmake_3.29.3.bb > > -- > > 2.39.2 > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199956): https://lists.openembedded.org/g/openembedded-core/message/199956 Mute This Topic: https://lists.openembedded.org/mt/106334730/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
