[meta-oe][scarthgap][PATCH 0/5] Upgrade 2023.03 -> 2025.01

[meta-oe][scarthgap][PATCH 0/5] Upgrade 2023.03 -> 2025.01

[alb3rt0.m3rciai]

From: amerciai <alb3rt0.m3rciai@gmail.com>

Upgrade can-utils from 2023.03 to 2025.01
- adds support for CAN XL including VCIDs (Linux v6.9+)
  https://github.com/linux-can/can-utils/pull/504

Khem Raj (2):
  can-utils: Fix build regression on musl
  can-utils: Fix build regression on musl

Ricardo Simoes (2):
  can-utils: Upgrade 2023.03 -> 2025.01
  can-utils: Split mcp251fd* into sub-package

amerciai (1):
  Remove can-utils_2023.03

 ...ime.h-for-timespec-struct-definition.patch | 28 +++++++++++
 ...-utils_2023.03.bb => can-utils_2025.01.bb} | 48 ++++++++++++++-----
 2 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
 rename meta-oe/recipes-extended/socketcan/{can-utils_2023.03.bb => can-utils_2025.01.bb} (63%)

-- 
2.34.1

[meta-oe][scarthgap][PATCH 1/5] can-utils: Upgrade 2023.03 -> 2025.01

[alb3rt0.m3rciai]

From: Ricardo Simoes <ricardo.simoes@pt.bosch.com>

Changelog: https://github.com/linux-can/can-utils/releases/tag/v2025.01

Signed-off-by: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../socketcan/can-utils_2025.01.bb            | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb

diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
new file mode 100644
index 0000000000..cad41944ec
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -0,0 +1,68 @@
+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 = "01083a64ebf28cc716efe2d2fd51c141042ae34b"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig update-alternatives
+
+PACKAGES =+ " \
+    ${PN}-access \
+    ${PN}-cantest \
+    ${PN}-isobusfs \
+    ${PN}-isobusfs-dev \
+    ${PN}-isotp \
+    ${PN}-j1939 \
+    ${PN}-log \
+    ${PN}-slcan \
+"
+
+FILES:${PN}-access = " \
+    ${bindir}/cangw \
+    ${bindir}/canlogserver \
+    ${bindir}/bcmserver \
+    ${bindir}/socketcand \
+    ${bindir}/cannelloni \
+"
+
+FILES:${PN}-cantest = " \
+    ${bindir}/canbusload \
+    ${bindir}/can-calc-bit-timing \
+    ${bindir}/canfdtest \
+"
+
+FILES:${PN}-isobusfs = " \
+    ${bindir}/isobusfs-cli \
+    ${bindir}/isobusfs-srv \
+    ${libdir}/libisobusfs.so \
+"
+
+FILES:${PN}-isobusfs-dev = " \
+    ${includedir}/isobusfs* \
+"
+
+FILES:${PN}-isotp = "${bindir}/isotp*"
+
+FILES:${PN}-j1939 = " \
+    ${bindir}/j* \
+    ${bindir}/testj1939 \
+"
+
+FILES:${PN}-log = "${bindir}/*log*"
+
+FILES:${PN}-slcan = "${bindir}/slcan*"
+
+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-ip"
-- 
2.34.1

[meta-oe][scarthgap][PATCH 2/5] can-utils: Split mcp251fd* into sub-package

[alb3rt0.m3rciai]

From: Ricardo Simoes <ricardo.simoes@pt.bosch.com>

The mcp251fd* tools are specific to Microchip MCP251xFD Family CAN
controllers. This commit creates the package can-utils-mcp251fd to keep
these tools separate.

Signed-off-by: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
index cad41944ec..932aa1de20 100644
--- a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -20,6 +20,7 @@ PACKAGES =+ " \
     ${PN}-isotp \
     ${PN}-j1939 \
     ${PN}-log \
+    ${PN}-mcp251xfd \
     ${PN}-slcan \
 "
 
@@ -56,6 +57,10 @@ FILES:${PN}-j1939 = " \
 
 FILES:${PN}-log = "${bindir}/*log*"
 
+FILES:${PN}-mcp251xfd = " \
+    ${bindir}/mcp251xfd* \
+"
+
 FILES:${PN}-slcan = "${bindir}/slcan*"
 
 ALTERNATIVE:${PN} = "candump cansend cansequence"
-- 
2.34.1

Re: [oe] [meta-oe][scarthgap][PATCH 2/5] can-utils: Split mcp251fd* into sub-package

[Gyorgy Sarvari]

Don't know if you had any discussions about this outside of this mailing
list (such updates are not in line with the LTS/Stable policy, but I
guess there can be exceptions...). However at least this looks like a
breaking change - if anyone is using these tools in their project, after
this update most likely they will face errors. Not a huge breaking
change, but still one, nevertheless.

On 4/18/25 13:31, Alberto Merciai via lists.openembedded.org wrote:
> From: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
>
> The mcp251fd* tools are specific to Microchip MCP251xFD Family CAN
> controllers. This commit creates the package can-utils-mcp251fd to keep
> these tools separate.
>
> Signed-off-by: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
> Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
> index cad41944ec..932aa1de20 100644
> --- a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
> +++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
> @@ -20,6 +20,7 @@ PACKAGES =+ " \
>      ${PN}-isotp \
>      ${PN}-j1939 \
>      ${PN}-log \
> +    ${PN}-mcp251xfd \
>      ${PN}-slcan \
>  "
>  
> @@ -56,6 +57,10 @@ FILES:${PN}-j1939 = " \
>  
>  FILES:${PN}-log = "${bindir}/*log*"
>  
> +FILES:${PN}-mcp251xfd = " \
> +    ${bindir}/mcp251xfd* \
> +"
> +
>  FILES:${PN}-slcan = "${bindir}/slcan*"
>  
>  ALTERNATIVE:${PN} = "candump cansend cansequence"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116953): https://lists.openembedded.org/g/openembedded-devel/message/116953
> Mute This Topic: https://lists.openembedded.org/mt/112329372/6084445
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

[meta-oe][scarthgap][PATCH 3/5] can-utils: Fix build regression on musl

[alb3rt0.m3rciai]

From: Khem Raj <raj.khem@gmail.com>

This got introduced with 2025.01 upgrade on musl systems

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
Cc: Mark Jonas <mark.jonas@de.bosch.com>
---
 meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
index 932aa1de20..d4ee34167d 100644
--- a/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61
 
 DEPENDS = "libsocketcan"
 
-SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master \
+           file://0001-Include-time.h-for-timespec-struct-definition.patch"
 
 SRCREV = "01083a64ebf28cc716efe2d2fd51c141042ae34b"
 
-- 
2.34.1

[meta-oe][scarthgap][PATCH 4/5] can-utils: Fix build regression on musl

[alb3rt0.m3rciai]

From: Khem Raj <raj.khem@gmail.com>

This got introduced with 2025.01 upgrade on musl systems

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
Cc: Mark Jonas <mark.jonas@de.bosch.com>
---
 ...ime.h-for-timespec-struct-definition.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch

diff --git a/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
new file mode 100644
index 0000000000..91b9dd3c4e
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
@@ -0,0 +1,28 @@
+From 4363ef59cc9f2169455f56453759d4a4d9b89a5f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 13 Feb 2025 22:14:47 -0800
+Subject: [PATCH] Include time.h for timespec struct definition
+
+Fixes
+git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec'
+   33 |         struct timespec next_send_time;
+      |                         ^
+
+Upstream-Status: Submitted [https://github.com/linux-can/can-utils/pull/579]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libj1939.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libj1939.h b/libj1939.h
+index 44393a2..7c19f43 100644
+--- a/libj1939.h
++++ b/libj1939.h
+@@ -17,6 +17,7 @@
+ #include <linux/can/j1939.h>
+ #include <stdbool.h>
+ #include <stdint.h>
++#include <time.h>
+ #include <sys/socket.h>
+ 
+ #ifndef J1939_LIB_H
-- 
2.34.1

[meta-oe][scarthgap][PATCH 5/5] Remove can-utils_2023.03

[alb3rt0.m3rciai]

From: amerciai <alb3rt0.m3rciai@gmail.com>

Signed-off-by: amerciai <alb3rt0.m3rciai@gmail.com>
---
 .../socketcan/can-utils_2023.03.bb            | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/socketcan/can-utils_2023.03.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
deleted file mode 100644
index ca6cb7db58..0000000000
--- a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb
+++ /dev/null
@@ -1,50 +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 = "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"
-
-- 
2.34.1