From 99500b3813a35838892187a1427867480a6e359f Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 24 Mar 2023 08:29:21 +0800 Subject: can-utils: upgrade 2021.08.0 -> 2023.03 Support of new kernel features: ----------------------------------- j1939: make use of new RX UAPI isotp: rework FRAME_TXTIME handling and buffer size (Linux v5.18+) isotp: add support for transmission without flow control (Linux v5.19+) mcp251xfd-dump: add support for dumps created with Linux kernel >= v5.18 can-calc-bit-timing: import bit timing calculation algorithm from v5.19 cangen: add support for SO_TXTIME includes: update to Linux 6.2 upstream (with CAN XL data structures) Improvements and features: -------------------------------- canfdtest: Add extended frame format / message length / FD / BRS support can-calc-bit-timing: add support for calculation of CAN-FD bit timings cangen: add option for absolute timeouts cangen: new generation mode - partially randomized payload (-D) slcan: increase BTR char limit to 8 for 32bit BTR log asc converter: support len8_dlc for Classical CAN frames candump: handle individual logfile name for stdout cansniffer: add CAN FD support cansniffer: make ASCII output switchable in CAN FD mode canplayer: introduce option to limit the number of processed frames Fixes: ----------------------- candump: print number of dropped frames as unsigned values candump: reserve enough space for ctrlmsg candump: fix accidentally disabled traffic timeout feature lib: fix seperator in snprintf_error_data Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../socketcan/can-utils_2023.03.bb | 50 +++++++++++++++++++++ .../recipes-extended/socketcan/can-utils_git.bb | 52 ---------------------- 2 files changed, 50 insertions(+), 52 deletions(-) create mode 100644 meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb delete mode 100644 meta-oe/recipes-extended/socketcan/can-utils_git.bb diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb b/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb new file mode 100644 index 0000000000..ca6cb7db58 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb @@ -0,0 +1,50 @@ +SUMMARY = "Linux CAN network development utilities" +LICENSE = "GPL-2.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61329e99f86fdd31" + +DEPENDS = "libsocketcan" + +SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" + +SRCREV = "cfe41963f3425e9adb01a70cfaddedf5e5982720" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-alternatives + +PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" + +FILES:${PN}-access = " \ + ${bindir}/cangw \ + ${bindir}/canlogserver \ + ${bindir}/bcmserver \ + ${bindir}/socketcand \ + ${bindir}/cannelloni \ +" + +FILES:${PN}-isotp = "${bindir}/isotp*" + +FILES:${PN}-j1939 = " \ + ${bindir}/j* \ + ${bindir}/testj1939 \ +" + +FILES:${PN}-cantest = " \ + ${bindir}/canbusload \ + ${bindir}/can-calc-bit-timing \ + ${bindir}/canfdtest \ +" + +FILES:${PN}-slcan = "${bindir}/slcan*" + +FILES:${PN}-log = "${bindir}/*log*" + +ALTERNATIVE:${PN} = "candump cansend cansequence" +ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" +ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" +ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" + +# busybox ip fails to configure can interfaces, so we need iproute2 to do so. +# See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. +RRECOMMENDS:${PN} += "iproute2" + diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb deleted file mode 100644 index 07b80a5307..0000000000 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Linux CAN network development utilities" -LICENSE = "GPL-2.0-only & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61329e99f86fdd31" - -DEPENDS = "libsocketcan" - -SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" - -SRCREV = "3615bac17e539a06835dcb90855eae844ee18053" - -PV = "2021.08.0" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-alternatives - -PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" - -FILES:${PN}-access = " \ - ${bindir}/cangw \ - ${bindir}/canlogserver \ - ${bindir}/bcmserver \ - ${bindir}/socketcand \ - ${bindir}/cannelloni \ -" - -FILES:${PN}-isotp = "${bindir}/isotp*" - -FILES:${PN}-j1939 = " \ - ${bindir}/j* \ - ${bindir}/testj1939 \ -" - -FILES:${PN}-cantest = " \ - ${bindir}/canbusload \ - ${bindir}/can-calc-bit-timing \ - ${bindir}/canfdtest \ -" - -FILES:${PN}-slcan = "${bindir}/slcan*" - -FILES:${PN}-log = "${bindir}/*log*" - -ALTERNATIVE:${PN} = "candump cansend cansequence" -ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" -ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" -ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" - -# busybox ip fails to configure can interfaces, so we need iproute2 to do so. -# See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. -RRECOMMENDS:${PN} += "iproute2" - -- cgit v1.2.3-54-g00ecf