libgpiod-1.x is still in use by some BSPs e.g. variscite SOMs, so we can not get rid of completely so give some time to move away from 1.x and disable ptests as they need older version of catch2 which is being removed
Signed-off-by: Khem Raj <[email protected]> Cc: Bartosz Golaszewski <[email protected]> --- ...nclude-missing-libgen.h-for-basename.patch | 25 +++++++++++++++++++ .../libgpiod/libgpiod_1.6.4.bb | 16 ++++++------ 2 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-Include-missing-libgen.h-for-basename.patch diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-Include-missing-libgen.h-for-basename.patch b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-Include-missing-libgen.h-for-basename.patch new file mode 100644 index 0000000000..4a250015ba --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-Include-missing-libgen.h-for-basename.patch @@ -0,0 +1,25 @@ +From b0ea35260ded2fbd41af46f2f18a61fb783a35be Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 10 Jun 2024 11:09:31 -0700 +Subject: [PATCH] Include missing libgen.h for basename() + +This is an error with newer musl otherwise + +Upstream-Status: Inappropriate [ Code removed in upstream ] +Signed-off-by: Khem Raj <[email protected]> +--- + lib/core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/core.c b/lib/core.c +index 35dcd8e..cf1d677 100644 +--- a/lib/core.c ++++ b/lib/core.c +@@ -10,6 +10,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <gpiod.h> ++#include <libgen.h> + #include <limits.h> + #include <linux/gpio.h> + #include <poll.h> diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb index 111a5727ba..9eec936f17 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -3,12 +3,16 @@ require libgpiod.inc LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" +SRC_URI += "file://0001-Include-missing-libgen.h-for-basename.patch" SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" inherit python3native +# catch2 v2.x is no longer available +PACKAGECONFIG:remove = "tests" + PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" @@ -32,14 +36,8 @@ RRECOMMENDS:${PN}-ptest += " \ " RDEPENDS:${PN}-ptest += " \ python3-packaging \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'tests', 'bats', '', d)} \ " -do_install_ptest:append() { - install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ - - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ - fi -} +deltask do_install_ptest +deltask do_install_ptest_base
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110800): https://lists.openembedded.org/g/openembedded-devel/message/110800 Mute This Topic: https://lists.openembedded.org/mt/106598537/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
