From dfcbbdfc486179f6ed0d4ea9b777236b20f7fc45 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 2 Mar 2023 16:44:42 +0100 Subject: libgpiod: update to v2.0 The final v2.0 release is out so update the recipe. Signed-off-by: Bartosz Golaszewski Signed-off-by: Khem Raj --- .../libgpiod/libgpiod-2.0-rc3/run-ptest | 24 ---------------------- .../libgpiod/libgpiod-2.0/run-ptest | 24 ++++++++++++++++++++++ .../recipes-support/libgpiod/libgpiod_2.0-rc3.bb | 21 ------------------- meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb | 21 +++++++++++++++++++ 4 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-support/libgpiod/libgpiod-2.0-rc3/run-ptest create mode 100644 meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest delete mode 100644 meta-oe/recipes-support/libgpiod/libgpiod_2.0-rc3.bb create mode 100644 meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.0-rc3/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.0-rc3/run-ptest deleted file mode 100644 index 9475f02535..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod-2.0-rc3/run-ptest +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -testbins="gpiod-test gpio-tools-test gpiod-cxx-test" - -ptestdir=$(dirname "$(readlink -f "$0")") -cd $ptestdir/tests - -# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to -# make sure configfs is mounted before running any tests. -modprobe configfs -mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config - -for testbin in $testbins; do - if test -e ./$testbin; then - ./$testbin > ./$testbin.out 2>&1 - if [ $? -ne 0 ]; then - echo "FAIL: $testbin" - else - echo "PASS: $testbin" - fi - else - echo "SKIP: $testbin" - fi -done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest new file mode 100644 index 0000000000..9475f02535 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest @@ -0,0 +1,24 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test gpiod-cxx-test" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.0-rc3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.0-rc3.bb deleted file mode 100644 index e56459b967..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.0-rc3.bb +++ /dev/null @@ -1,21 +0,0 @@ -require libgpiod.inc - -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" -LIC_FILES_CHKSUM = " \ - file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ - file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ -" - -SRC_URI[sha256sum] = "1d1756d465525deb668526571dc6ed7e08f7b8e7745b10fc028208a22fb7adf8" - -S = "${WORKDIR}/libgpiod-2.0" - -# We must enable gpioset-interactive for all gpio-tools tests to pass -PACKAGECONFIG[tests] = "--enable-tests --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" -PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" - -FILES:${PN}-tools += "${bindir}/gpionotify" -FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" - -RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb new file mode 100644 index 0000000000..becc9adb29 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb @@ -0,0 +1,21 @@ +require libgpiod.inc + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +SRC_URI[sha256sum] = "f74cbf82038b3cb98ebeb25bce55ee2553be28194002d2a9889b9268cce2dd07" + +S = "${WORKDIR}/libgpiod-2.0" + +# We must enable gpioset-interactive for all gpio-tools tests to pass +PACKAGECONFIG[tests] = "--enable-tests --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" +PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" + +FILES:${PN}-tools += "${bindir}/gpionotify" +FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" + +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim" -- cgit v1.2.3-54-g00ecf