deleted file mode 100644
@@ -1,42 +0,0 @@
-From 464ed82087b0514694ab69e2808e859cb6f13833 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 22 Nov 2024 10:35:12 -0800
-Subject: [PATCH] can_linux: initialize msghdr in a portable way
-
-musl has padding bytes inside the msghdr struct which means initializing
-full structure will cause wrong assignments, doing partial assignment is
-more portable and assign the elements after that
-
-Fixes
-src/core/can_linux.c:362:71: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion]
- | struct msghdr msg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
- | ^~~~
-
-Upstream-Status: Submitted [https://github.com/CANopenTerm/CANopenTerm/pull/70]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/core/can_linux.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/can_linux.c b/src/core/can_linux.c
-index d8824be..b4e7907 100644
---- a/src/core/can_linux.c
-+++ b/src/core/can_linux.c
-@@ -359,11 +359,16 @@ static char** get_can_interfaces(int* count)
- int fd;
- char buf[BUFFER_SIZE] = { 0 };
- struct iovec iov = { buf, sizeof(buf) };
-- struct msghdr msg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+ struct msghdr msg = { 0 };
- int len;
- int max_interfaces = 10;
- int can_count = 0;
- char** can_interfaces = (char**)os_calloc(max_interfaces * sizeof(char*), sizeof(char));
-+
-+ msg.msg_name = &sa;
-+ msg.msg_namelen = sizeof(sa);
-+ msg.msg_iov = &iov;
-+ msg.msg_iovlen = 1;
-
- struct
- {
similarity index 68%
rename from meta-oe/recipes-extended/canopenterm/canopenterm_1.0.8.bb
rename to meta-oe/recipes-extended/canopenterm/canopenterm_1.0.9.bb
@@ -13,19 +13,18 @@ BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474"
-DEPENDS = "libinih libsdl2 lua libsocketcan pocketpy"
+DEPENDS = "cjson libinih libsdl2 lua libsocketcan pocketpy"
-SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \
- file://0001-can_linux-initialize-msghdr-in-a-portable-way.patch \
- "
-SRCREV = "5bc04e09351f68e889381e1912b0445c4f18ee32"
+SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main"
+
+SRCREV = "fcf2a49eb1ef3ac5f5d17ac1865be6dfbd9e33d5"
S = "${WORKDIR}/git"
-inherit cmake
+inherit cmake ptest
EXTRA_OECMAKE += "-DBUILD_YOCTO=ON"
-FILES:${PN} += "${bindir}/CANopenTerm ${datadir}"
+FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}"
-RDEPENDS:${PN} = "libinih libsdl2 lua libsocketcan pocketpy"
+RDEPENDS:${PN} = "cjson libinih libsdl2 lua libsocketcan pocketpy"
- Add support for CANopen Profile data base files using a well documented JSON-based file format. - Include codb to JSON converter (codb2json). - Add API functions to generate test reports (JUnix XML). - Removed PicoC support for the greater good. - Various improvements and bug fixes. Signed-off-by: Michael Fitzmayer <mail@michael-fitzmayer.de> --- ...-initialize-msghdr-in-a-portable-way.patch | 42 ------------------- ...openterm_1.0.8.bb => canopenterm_1.0.9.bb} | 15 ++++--- 2 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm/0001-can_linux-initialize-msghdr-in-a-portable-way.patch rename meta-oe/recipes-extended/canopenterm/{canopenterm_1.0.8.bb => canopenterm_1.0.9.bb} (68%)