From 5b4e266ef5c6cc6d6393f40a130d1ae98a2a55fa Mon Sep 17 00:00:00 2001 From: Michael Fitzmayer Date: Sat, 28 Mar 2026 22:30:55 +0100 Subject: canopenterm: update to version 2.00 - Switched to a new versioning scheme: 1.0.13 -> 2.00 - Reworked CAN interface handling by migrating to the CANvenient abstraction layer - Improved/updated auto-completion using isocline - Various bug fixes Signed-off-by: Michael Fitzmayer Signed-off-by: Khem Raj --- ...ake-Do-not-pin-to-c89-constructs-on-linux.patch | 33 ---------------------- .../canopenterm/canopenterm_1.0.13.bb | 30 -------------------- .../canopenterm/canopenterm_2.00.bb | 28 ++++++++++++++++++ 3 files changed, 28 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch delete mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb create mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb (limited to 'meta-oe/recipes-extended/canopenterm') diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch deleted file mode 100644 index e6213c473d..0000000000 --- a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 694563e023a296ecfd4c73fac681509323c14ada Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 24 Mar 2026 10:01:59 -0700 -Subject: [PATCH] cmake: Do not pin to c89 constructs on linux - -This does not work with latest lua - -Fixes -| 91 | #error "POSIX is not compatible with C89" -| | ^ -| 1 error generated. -| [44/51] Building C object CMakeFiles/crossline.dir/src/crossline/crossline.c.o - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - cmake/os_linux.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/os_linux.cmake b/cmake/os_linux.cmake -index 7096cbd..ef18d56 100644 ---- a/cmake/os_linux.cmake -+++ b/cmake/os_linux.cmake -@@ -56,7 +56,7 @@ if (BUILD_YOCTO) - if (LUA_FOUND) - include_directories(${LUA_INCLUDE_DIR}) - set(PLATFORM_LIBS ${PLATFORM_LIBS} ${LUA_LIBRARIES}) -- add_compile_definitions(LUA_USE_C89 LUA_USE_LINUX) -+ add_compile_definitions(LUA_USE_LINUX) - else() - message(FATAL_ERROR "Lua not found") - endif() diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb deleted file mode 100644 index 25c7d97451..0000000000 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb +++ /dev/null @@ -1,30 +0,0 @@ - -SUMMARY = "CANopenTerm is a versatile software tool to analyse and \ - configure CANopen devices. \ - " -DESCRIPTION = "CANopenTerm is an open-source software tool designed for the \ - development, testing, and analysis of CANopen CC networks and \ - devices. It extends its capabilities to support other CAN CC \ - protocols, including SAE J1939 and OBD-II. \ - " -HOMEPAGE = "https://canopenterm.de" -BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5f8a62fabd50ce3f1d7794bc849ae7a5" - -DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy" - -SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ - file://0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch" - -SRCREV = "b0555360e5e8b444a2a9e14088fd253412184eb8" - - -inherit cmake ptest - -EXTRA_OECMAKE += "-DBUILD_YOCTO=ON" - -FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" - -RDEPENDS:${PN} = "cjson libinih libsdl3 lua libsocketcan pocketpy" diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb new file mode 100644 index 0000000000..1e86a76927 --- /dev/null +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb @@ -0,0 +1,28 @@ + +SUMMARY = "CANopenTerm is a versatile software tool to analyse and \ + configure CANopen devices. \ + " +DESCRIPTION = "CANopenTerm is an open-source software tool designed for the \ + development, testing, and analysis of CANopen CC networks and \ + devices. It extends its capabilities to support other CAN CC \ + protocols, including SAE J1939 and OBD-II. \ + " +HOMEPAGE = "https://canopenterm.de" +BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=bd2edc721b4a0289efe949bdbe7dda79" + +DEPENDS = "canvenient cjson isocline libinih libsdl3 lua pocketpy" + +SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" +SRCREV = "6024d99d1d34f8e3fec20a2150fc44380cf40fb2" + + +inherit cmake ptest + +EXTRA_OECMAKE += "-DBUILD_YOCTO=ON" + +FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" + +RDEPENDS:${PN} = "canvenient cjson libinih libsdl3 lua pocketpy" -- cgit v1.2.3-54-g00ecf