From 2482a8b0014f02bf7d310f5bd83634e0346f2beb Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 13 Nov 2025 19:18:52 +1300 Subject: [PATCH] libgpiod: update v2.1.2 -> v2.1.3 Bug fixes: - fix C++ tests with recent kernels which introduced stricter reconfigure behavior - fix a use-after-free bug in python bindings - fix passing the event clock property to line requests in python bindings - fix a memory leak in tools - make sure the string buffers in line-info and chip-info are big enough to not truncate the strings they hold below the size accepted by the kernel Dropped patch which is merged in the upstream Signed-off-by: Bartosz Golaszewski Signed-off-by: Khem Raj (cherry picked from commit 9958590b703a79b735874ea59b54aa4bb7233811) Signed-off-by: Ankur Tyagi Signed-off-by: Anuj Mittal --- ...ts-set-direction-when-reconfiguring-.patch | 38 ------------------- .../{libgpiod_2.1.2.bb => libgpiod_2.1.3.bb} | 4 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch rename meta-oe/recipes-support/libgpiod/{libgpiod_2.1.2.bb => libgpiod_2.1.3.bb} (87%) diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch deleted file mode 100644 index f8b94f0b99..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c7126b7b5dee0ed5433cf9265ccc79095d53939 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Mon, 8 Jul 2024 11:48:27 +0200 -Subject: [PATCH] bindings: cxx: tests: set direction when reconfiguring lines - -Linux kernel commit b44039638741 ("gpiolib: cdev: Ignore reconfiguration -without direction") made the direction setting mandatory for line config -passed to the kernel when reconfiguring requested lines. Fix the C++ test -case which doesn't do it and now fails due to the rest of the settings -being ignored. - -Reviewed-by: Kent Gibson -Link: https://lore.kernel.org/r/20240708094827.84986-1-brgl@bgdev.pl -Signed-off-by: Bartosz Golaszewski - -Upstream-Status: Backport -[https://web.git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/commit/?id=3e224d885b1de54fe5510b9c5e7296260a1a4507] - -Signed-off-by: Libo Chen ---- - bindings/cxx/tests/tests-line-request.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp -index 9632ae0..6e29532 100644 ---- a/bindings/cxx/tests/tests-line-request.cpp -+++ b/bindings/cxx/tests/tests-line-request.cpp -@@ -208,6 +208,7 @@ TEST_CASE("values can be read", "[line-request]") - .add_line_settings( - offs, - ::gpiod::line_settings() -+ .set_direction(direction::INPUT) - .set_active_low(true)) - ); - --- -2.44.1 - diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb similarity index 87% rename from meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb rename to meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb index edbde0f7a7..4463f7d4df 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ " -SRC_URI += "file://0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch" - FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" -SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" +SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58" # Enable all project features for ptest PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"