mets-openembedded bumped the version to 1.4 [1]. We need to remove a few patches that no longer apply and add a new patch to fix a compile issue related to missing the pthread.h file in an include.
[1] https://git.openembedded.org/meta-openembedded/commit/?id=3e3f0eac0f599e92442d8c6c0000eb961d8c4170 Signed-off-by: Ryan Eatmon <[email protected]> --- .../open62541/open62541-arago.inc | 2 +- ...Lists-do-not-install-git-directories.patch | 27 -------- .../0001-examples-Remove-sys-io.h.patch | 68 ------------------- ...blisher_rt_level-Add-missing-pthread.patch | 38 +++++++++++ ...tests-fix-typing-of-size_t-in-printf.patch | 64 ----------------- 5 files changed, 39 insertions(+), 160 deletions(-) delete mode 100644 meta-arago-extras/recipes-connectivity/open62541/open62541/0001-CMakeLists-do-not-install-git-directories.patch delete mode 100644 meta-arago-extras/recipes-connectivity/open62541/open62541/0001-examples-Remove-sys-io.h.patch create mode 100644 meta-arago-extras/recipes-connectivity/open62541/open62541/0001-server_pubsub_publisher_rt_level-Add-missing-pthread.patch delete mode 100644 meta-arago-extras/recipes-connectivity/open62541/open62541/0001-tests-fix-typing-of-size_t-in-printf.patch diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541-arago.inc b/meta-arago-extras/recipes-connectivity/open62541/open62541-arago.inc index 745c88a1..f92e1e90 100644 --- a/meta-arago-extras/recipes-connectivity/open62541/open62541-arago.inc +++ b/meta-arago-extras/recipes-connectivity/open62541/open62541-arago.inc @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/open62541:" SRC_URI:append = " \ file://0001-examples-client-allow-configurable-server.patch \ - file://0001-examples-Remove-sys-io.h.patch \ + file://0001-server_pubsub_publisher_rt_level-Add-missing-pthread.patch \ " EXTRA_OECMAKE = "-DUA_BUILD_EXAMPLES=1" diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-CMakeLists-do-not-install-git-directories.patch b/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-CMakeLists-do-not-install-git-directories.patch deleted file mode 100644 index 89e47635..00000000 --- a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-CMakeLists-do-not-install-git-directories.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a80cd1702055086e2197851047e2eb65323b7656 Mon Sep 17 00:00:00 2001 -From: Jacob Stiffler <[email protected]> -Date: Thu, 19 Mar 2020 07:40:42 -0400 -Subject: [PATCH] CMakeLists: do not install git directories - -Signed-off-by: Jacob Stiffler <[email protected]> - -Upstream-Status: Pending ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7b15c6..264d484 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1350,6 +1350,7 @@ install(DIRECTORY ${UA_install_tools_dirs} - FILES_MATCHING - PATTERN "*" - PATTERN "*.pyc" EXCLUDE -+ PATTERN ".git" EXCLUDE - ) - - install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir}) --- -2.7.4 - diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-examples-Remove-sys-io.h.patch b/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-examples-Remove-sys-io.h.patch deleted file mode 100644 index 3119fb3d..00000000 --- a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-examples-Remove-sys-io.h.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 123f7274cf6cb65866c910dec16ec1595495d1dc Mon Sep 17 00:00:00 2001 -From: Ryan Eatmon <[email protected]> -Date: Thu, 29 Jun 2023 11:14:50 -0500 -Subject: [PATCH] examples: Remove sys/io.h - -This header is missing on some architectures, aarch64 being one of them. - -Upstream-Status: Pending - -Signed-off-by: Ryan Eatmon <[email protected]> ---- - examples/pubsub_realtime/pubsub_TSN_loopback.c | 1 - - examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c | 1 - - examples/pubsub_realtime/pubsub_TSN_publisher.c | 1 - - examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c -index 803a3c107..e90015aa3 100644 ---- a/examples/pubsub_realtime/pubsub_TSN_loopback.c -+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c -@@ -77,7 +77,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <linux/types.h> --#include <sys/io.h> - #include <getopt.h> - - /* For thread operations */ -diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c -index 7db37e9d5..ba5f7aff6 100644 ---- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c -+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c -@@ -54,7 +54,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <linux/types.h> --#include <sys/io.h> - #include <getopt.h> - - /* For thread operations */ -diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c -index 945ec3d4f..5ff866908 100644 ---- a/examples/pubsub_realtime/pubsub_TSN_publisher.c -+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c -@@ -78,7 +78,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <linux/types.h> --#include <sys/io.h> - #include <getopt.h> - - /* For thread operations */ -diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c -index 72dcd3997..73967577f 100644 ---- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c -+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c -@@ -57,7 +57,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <linux/types.h> --#include <sys/io.h> - #include <getopt.h> - - /* For thread operations */ --- -2.17.1 - diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-server_pubsub_publisher_rt_level-Add-missing-pthread.patch b/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-server_pubsub_publisher_rt_level-Add-missing-pthread.patch new file mode 100644 index 00000000..8519fd5c --- /dev/null +++ b/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-server_pubsub_publisher_rt_level-Add-missing-pthread.patch @@ -0,0 +1,38 @@ +From 7af0f9a29ec011530a2b8c4b60e719e76ce0cdf0 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Fri, 16 Jan 2026 16:40:07 -0600 +Subject: [PATCH] server_pubsub_publisher_rt_level: Add missing pthread.h + +Fix for errors: + +open62541-1.4.14/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c:78:5: error: implicit declaration of function 'pthread_create' [-Wimplicit-function-declaration] + 78 | pthread_create(&pubSubELThread, NULL, runPubSubEL, NULL); + | ^~~~~~~~~~~~~~ +open62541-1.4.14/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c:78:5: warning: nested extern declaration of 'pthread_create' [-Wnested-externs] +open62541-1.4.14/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c:173:5: error: implicit declaration of function 'pthread_join'; did you mean 'pthread_kill'? [-Wimplicit-function-declaration] + 173 | pthread_join(pubSubELThread, NULL); + | ^~~~~~~~~~~~ + | pthread_kill + +Upstream-Status: Pending + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + examples/pubsub_realtime/server_pubsub_publisher_rt_level.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c +index 0ec133d1f..caa440596 100644 +--- a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c ++++ b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c +@@ -8,6 +8,7 @@ + #include <open62541/types.h> + + #include <signal.h> ++#include <pthread.h> + + #define PUBSUB_CONFIG_PUBLISH_CYCLE_MS 100 + #define PUBSUB_CONFIG_FIELD_COUNT 10 +-- +2.43.0 + diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-tests-fix-typing-of-size_t-in-printf.patch b/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-tests-fix-typing-of-size_t-in-printf.patch deleted file mode 100644 index 21f7a162..00000000 --- a/meta-arago-extras/recipes-connectivity/open62541/open62541/0001-tests-fix-typing-of-size_t-in-printf.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c04171fb423c16f1aa9ad31d6f95e95b54b6f26f Mon Sep 17 00:00:00 2001 -From: Jacob Stiffler <[email protected]> -Date: Wed, 9 Jan 2019 08:31:27 -0500 -Subject: [PATCH] tests: fix typing of size_t in printf - -Upstream-Status: Pending - -Signed-off-by: Jacob Stiffler <[email protected]> ---- - tests/check_timer.c | 2 +- - tests/server/check_server_historical_data.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/check_timer.c b/tests/check_timer.c -index 051f1bc..1021cf4 100644 ---- a/tests/check_timer.c -+++ b/tests/check_timer.c -@@ -52,7 +52,7 @@ START_TEST(benchmarkTimer) { - clock_t finish = clock(); - double time_spent = (double)(finish - begin) / CLOCKS_PER_SEC; - printf("duration was %f s\n", time_spent); -- printf("%lu callbacks\n", count); -+ printf("%lu callbacks\n", (long unsigned)count); - - UA_Timer_deleteMembers(&timer); - } END_TEST -diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c -index 8f16089..0dfcba0 100644 ---- a/tests/server/check_server_historical_data.c -+++ b/tests/server/check_server_historical_data.c -@@ -325,7 +325,7 @@ testHistoricalDataBackend(size_t maxResponseSize) - UA_UInt32 retval = 0; - size_t i = 0; - testTuple *current = &testRequests[i]; -- fprintf(stderr, "Testing with maxResponseSize of %lu\n", maxResponseSize); -+ fprintf(stderr, "Testing with maxResponseSize of %lu\n", (long unsigned)maxResponseSize); - fprintf(stderr, "Start | End | numValuesPerNode | returnBounds |ContPoint| {Expected}{Result} Result\n"); - fprintf(stderr, "------+------+------------------+--------------+---------+----------------\n"); - size_t j; -@@ -372,7 +372,7 @@ testHistoricalDataBackend(size_t maxResponseSize) - ++counter; - - if(response.resultsSize != 1) { -- fprintf(stderr, "ResultError:Size %lu %s", response.resultsSize, UA_StatusCode_name(response.responseHeader.serviceResult)); -+ fprintf(stderr, "ResultError:Size %lu %s", (long unsigned)response.resultsSize, UA_StatusCode_name(response.responseHeader.serviceResult)); - readOk = false; - UA_HistoryReadResponse_deleteMembers(&response); - break; -@@ -465,10 +465,10 @@ testHistoricalDataBackend(size_t maxResponseSize) - } - UA_ByteString_deleteMembers(&continuous); - if (!readOk) { -- fprintf(stderr, "} Fail (%lu requests)\n", counter); -+ fprintf(stderr, "} Fail (%lu requests)\n", (long unsigned)counter); - ++retval; - } else { -- fprintf(stderr, "} OK (%lu requests)\n", counter); -+ fprintf(stderr, "} OK (%lu requests)\n", (long unsigned)counter); - } - current = &testRequests[++i]; - } --- -2.7.4 - -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16981): https://lists.yoctoproject.org/g/meta-arago/message/16981 Mute This Topic: https://lists.yoctoproject.org/mt/117306977/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
