summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>2023-08-25 20:09:46 +0200
committerKhem Raj <raj.khem@gmail.com>2023-08-26 17:32:45 -0700
commit54e11a6c5b169454cab60c7e6a1da8930d42b495 (patch)
tree7035ac060ce0a695852f3d49e4f56c755827cd29
parent9882289b754a70209489de2a7a151d352dd30597 (diff)
downloadmeta-openembedded-54e11a6c5b169454cab60c7e6a1da8930d42b495.tar.gz
libgpiod: update to v2.0.2
This is a small bug-fix release addressing a segfault, a memory corruption bug and a couple minor issues. This also removes the patch that's already upstream. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch67
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb (renamed from meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb)4
2 files changed, 1 insertions, 70 deletions
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch
deleted file mode 100644
index 0b2a5e6a8c..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From 53f9670d6af1bd0745c1df9c469b269c72607b23 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Tue, 6 Jun 2023 08:04:27 -0700
4Subject: [PATCH] tools: tests: modify delays in toggle test
5
6The test "gpioset: toggle (continuous)" uses fixed delays to test
7toggling values. This is not reliable, so we switch to looking
8for transitions from one value to another.
9
10We wait for a transition up to 1.5 seconds.
11
12Signed-off-by: Joe Slater <joe.slater@windriver.com>
13Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
14
15Upstream-Status: Accepted
16
17Signed-off-by: Joe Slater <joe.slater@windriver.com>
18---
19 tools/gpio-tools-test.bats | 21 ++++++++++++++++-----
20 1 file changed, 16 insertions(+), 5 deletions(-)
21
22diff --git a/tools/gpio-tools-test.bats b/tools/gpio-tools-test.bats
23index c83ca7d..929c35a 100755
24--- a/tools/gpio-tools-test.bats
25+++ b/tools/gpio-tools-test.bats
26@@ -141,6 +141,20 @@ gpiosim_check_value() {
27 [ "$VAL" = "$EXPECTED" ]
28 }
29
30+gpiosim_wait_value() {
31+ local OFFSET=$2
32+ local EXPECTED=$3
33+ local DEVNAME=${GPIOSIM_DEV_NAME[$1]}
34+ local CHIPNAME=${GPIOSIM_CHIP_NAME[$1]}
35+ local PORT=$GPIOSIM_SYSFS/$DEVNAME/$CHIPNAME/sim_gpio$OFFSET/value
36+
37+ for i in {1..15}; do
38+ [ "$(<$PORT)" = "$EXPECTED" ] && return
39+ sleep 0.1
40+ done
41+ return 1
42+}
43+
44 gpiosim_cleanup() {
45 for CHIP in ${!GPIOSIM_CHIP_NAME[@]}
46 do
47@@ -1567,15 +1581,12 @@ request_release_line() {
48 gpiosim_check_value sim0 4 0
49 gpiosim_check_value sim0 7 0
50
51- sleep 1
52-
53- gpiosim_check_value sim0 1 0
54+ gpiosim_wait_value sim0 1 0
55 gpiosim_check_value sim0 4 1
56 gpiosim_check_value sim0 7 1
57
58- sleep 1
59
60- gpiosim_check_value sim0 1 1
61+ gpiosim_wait_value sim0 1 1
62 gpiosim_check_value sim0 4 0
63 gpiosim_check_value sim0 7 0
64 }
65--
662.25.1
67
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb
index 6958f2d841..7533e0a258 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb
@@ -9,9 +9,7 @@ LIC_FILES_CHKSUM = " \
9 9
10FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" 10FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:"
11 11
12SRC_URI += "file://gpio-tools-test-bats-modify.patch" 12SRC_URI[sha256sum] = "c3c923dc63b7b1b02639c9179c81e3d9febf0887bbaa59775990229cdbedb88b"
13
14SRC_URI[sha256sum] = "b5367d28d045b36007a4ffd42cceda4c358737ef4f2ce22b0c1d05ec57a38392"
15 13
16# Enable all project features for ptest 14# Enable all project features for ptest
17PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" 15PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"