diff options
| author | Michael Fitzmayer <mail@michael-fitzmayer.de> | 2026-03-28 22:30:55 +0100 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-03-30 19:46:41 -0700 |
| commit | f1254b17b17a7ba74e2a75a4b2b5ef827f40c466 (patch) | |
| tree | 3c177d8e7ef6c91e89130fd5f77453331b31f321 | |
| parent | 0d559bc29ebce7925b5b5ac016b0611b53e307d6 (diff) | |
| download | meta-openembedded-f1254b17b17a7ba74e2a75a4b2b5ef827f40c466.tar.gz | |
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 <mail@michael-fitzmayer.de>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-oe/recipes-extended/canopenterm/canopenterm/0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb (renamed from meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb) | 12 |
2 files changed, 5 insertions, 40 deletions
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 @@ | |||
| 1 | From 694563e023a296ecfd4c73fac681509323c14ada Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Tue, 24 Mar 2026 10:01:59 -0700 | ||
| 4 | Subject: [PATCH] cmake: Do not pin to c89 constructs on linux | ||
| 5 | |||
| 6 | This does not work with latest lua | ||
| 7 | |||
| 8 | Fixes | ||
| 9 | | 91 | #error "POSIX is not compatible with C89" | ||
| 10 | | | ^ | ||
| 11 | | 1 error generated. | ||
| 12 | | [44/51] Building C object CMakeFiles/crossline.dir/src/crossline/crossline.c.o | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 17 | --- | ||
| 18 | cmake/os_linux.cmake | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/cmake/os_linux.cmake b/cmake/os_linux.cmake | ||
| 22 | index 7096cbd..ef18d56 100644 | ||
| 23 | --- a/cmake/os_linux.cmake | ||
| 24 | +++ b/cmake/os_linux.cmake | ||
| 25 | @@ -56,7 +56,7 @@ if (BUILD_YOCTO) | ||
| 26 | if (LUA_FOUND) | ||
| 27 | include_directories(${LUA_INCLUDE_DIR}) | ||
| 28 | set(PLATFORM_LIBS ${PLATFORM_LIBS} ${LUA_LIBRARIES}) | ||
| 29 | - add_compile_definitions(LUA_USE_C89 LUA_USE_LINUX) | ||
| 30 | + add_compile_definitions(LUA_USE_LINUX) | ||
| 31 | else() | ||
| 32 | message(FATAL_ERROR "Lua not found") | ||
| 33 | endif() | ||
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb index 25c7d97451..1e86a76927 100644 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.13.bb +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_2.00.bb | |||
| @@ -11,14 +11,12 @@ HOMEPAGE = "https://canopenterm.de" | |||
| 11 | BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" | 11 | BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues" |
| 12 | 12 | ||
| 13 | LICENSE = "MIT" | 13 | LICENSE = "MIT" |
| 14 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5f8a62fabd50ce3f1d7794bc849ae7a5" | 14 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=bd2edc721b4a0289efe949bdbe7dda79" |
| 15 | 15 | ||
| 16 | DEPENDS = "cjson libinih libsdl3 lua libsocketcan pocketpy" | 16 | DEPENDS = "canvenient cjson isocline libinih libsdl3 lua pocketpy" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ | 18 | SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" |
| 19 | file://0001-cmake-Do-not-pin-to-c89-constructs-on-linux.patch" | 19 | SRCREV = "6024d99d1d34f8e3fec20a2150fc44380cf40fb2" |
| 20 | |||
| 21 | SRCREV = "b0555360e5e8b444a2a9e14088fd253412184eb8" | ||
| 22 | 20 | ||
| 23 | 21 | ||
| 24 | inherit cmake ptest | 22 | inherit cmake ptest |
| @@ -27,4 +25,4 @@ EXTRA_OECMAKE += "-DBUILD_YOCTO=ON" | |||
| 27 | 25 | ||
| 28 | FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" | 26 | FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}" |
| 29 | 27 | ||
| 30 | RDEPENDS:${PN} = "cjson libinih libsdl3 lua libsocketcan pocketpy" | 28 | RDEPENDS:${PN} = "canvenient cjson libinih libsdl3 lua pocketpy" |
