From aa45e4ed4ebc8f36de5d5305d0a7861e8185e53f Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Fri, 18 Jul 2025 12:11:40 +0200 Subject: libgit2: upgrade 1.9.0 -> 1.9.1 Dropped 0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch because it's included in this release. Changelog: see https://github.com/libgit2/libgit2/releases/tag/v1.9.1 (From OE-Core rev: 92bfe7333748bf52a436f03452fecacd95b6b0bf) Signed-off-by: Gyorgy Sarvari Signed-off-by: Richard Purdie --- ...-CMakeLists.txt-install-cmake-files-into-.patch | 32 ---------------------- meta/recipes-support/libgit2/libgit2_1.9.0.bb | 25 ----------------- meta/recipes-support/libgit2/libgit2_1.9.1.bb | 23 ++++++++++++++++ 3 files changed, 23 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch delete mode 100644 meta/recipes-support/libgit2/libgit2_1.9.0.bb create mode 100644 meta/recipes-support/libgit2/libgit2_1.9.1.bb diff --git a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch deleted file mode 100644 index ae48524e0d..0000000000 --- a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 7 Jan 2025 18:56:19 +0100 -Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into - configured libdir - -libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar. - -Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004] -Signed-off-by: Alexander Kanavin ---- - src/libgit2/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt -index a7d3c7ca4..16b3a23d9 100644 ---- a/src/libgit2/CMakeLists.txt -+++ b/src/libgit2/CMakeLists.txt -@@ -119,11 +119,11 @@ configure_file(config.cmake.in - install(FILES - "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake" - "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" -- DESTINATION "lib/cmake/${PROJECT_NAME}") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - install( - EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME} - NAMESPACE "${PROJECT_NAME}::" -- DESTINATION "lib/cmake/${PROJECT_NAME}") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - - # Install - diff --git a/meta/recipes-support/libgit2/libgit2_1.9.0.bb b/meta/recipes-support/libgit2/libgit2_1.9.0.bb deleted file mode 100644 index 66ec62f17a..0000000000 --- a/meta/recipes-support/libgit2/libgit2_1.9.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \ - file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \ - " -SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DBUILD_TESTS=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DREGEX_BACKEND='pcre2' \ -" - -BBCLASSEXTEND = "native" - -do_install:append() { - sed -i -e 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/cmake/libgit2/libgit2Targets.cmake -} diff --git a/meta/recipes-support/libgit2/libgit2_1.9.1.bb b/meta/recipes-support/libgit2/libgit2_1.9.1.bb new file mode 100644 index 0000000000..43957a2087 --- /dev/null +++ b/meta/recipes-support/libgit2/libgit2_1.9.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "the Git linkable library" +HOMEPAGE = "http://libgit2.github.com/" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" + +DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" + +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.9;protocol=https;tag=v${PV}" +SRCREV = "0060d9cf5666f015b1067129bd874c6cc4c9c7ac" + +inherit cmake + +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DREGEX_BACKEND='pcre2' \ +" + +BBCLASSEXTEND = "native" + +do_install:append() { + sed -i -e 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/cmake/libgit2/libgit2Targets.cmake +} -- cgit v1.2.3-54-g00ecf