diff options
Diffstat (limited to 'meta-oe/recipes-extended/socketcan')
-rw-r--r-- | meta-oe/recipes-extended/socketcan/can-isotp_git.bb | 3 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb (renamed from meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb) | 51 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb | 3 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb | 3 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/socketcand_git.bb | 15 |
6 files changed, 83 insertions, 20 deletions
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index ab97356e9b..530e38ce21 100644 --- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb | |||
@@ -5,8 +5,9 @@ PV = "1.0+git" | |||
5 | 5 | ||
6 | SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" |
7 | 7 | ||
8 | # Upstream repo does not tag | ||
9 | UPSTREAM_CHECK_COMMITS = "1" | ||
8 | 10 | ||
9 | S = "${WORKDIR}/git" | ||
10 | 11 | ||
11 | inherit module | 12 | inherit module |
12 | 13 | ||
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 @@ | |||
1 | From 4363ef59cc9f2169455f56453759d4a4d9b89a5f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 13 Feb 2025 22:14:47 -0800 | ||
4 | Subject: [PATCH] Include time.h for timespec struct definition | ||
5 | |||
6 | Fixes | ||
7 | git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec' | ||
8 | 33 | struct timespec next_send_time; | ||
9 | | ^ | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/linux-can/can-utils/pull/579] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | libj1939.h | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/libj1939.h b/libj1939.h | ||
18 | index 44393a2..7c19f43 100644 | ||
19 | --- a/libj1939.h | ||
20 | +++ b/libj1939.h | ||
21 | @@ -17,6 +17,7 @@ | ||
22 | #include <linux/can/j1939.h> | ||
23 | #include <stdbool.h> | ||
24 | #include <stdint.h> | ||
25 | +#include <time.h> | ||
26 | #include <sys/socket.h> | ||
27 | |||
28 | #ifndef J1939_LIB_H | ||
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb index ca6cb7db58..5dc41bcb93 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb | |||
@@ -4,22 +4,46 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61 | |||
4 | 4 | ||
5 | DEPENDS = "libsocketcan" | 5 | DEPENDS = "libsocketcan" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master \ |
8 | file://0001-Include-time.h-for-timespec-struct-definition.patch" | ||
8 | 9 | ||
9 | SRCREV = "cfe41963f3425e9adb01a70cfaddedf5e5982720" | 10 | SRCREV = "01083a64ebf28cc716efe2d2fd51c141042ae34b" |
10 | 11 | ||
11 | S = "${WORKDIR}/git" | ||
12 | 12 | ||
13 | inherit autotools pkgconfig update-alternatives | 13 | inherit cmake pkgconfig update-alternatives |
14 | 14 | ||
15 | PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" | 15 | PACKAGES =+ " \ |
16 | ${PN}-access \ | ||
17 | ${PN}-cantest \ | ||
18 | ${PN}-isobusfs \ | ||
19 | ${PN}-isobusfs-dev \ | ||
20 | ${PN}-isotp \ | ||
21 | ${PN}-j1939 \ | ||
22 | ${PN}-log \ | ||
23 | ${PN}-mcp251xfd \ | ||
24 | ${PN}-slcan \ | ||
25 | " | ||
16 | 26 | ||
17 | FILES:${PN}-access = " \ | 27 | FILES:${PN}-access = " \ |
18 | ${bindir}/cangw \ | 28 | ${bindir}/cangw \ |
19 | ${bindir}/canlogserver \ | 29 | ${bindir}/canlogserver \ |
20 | ${bindir}/bcmserver \ | 30 | ${bindir}/bcmserver \ |
21 | ${bindir}/socketcand \ | 31 | " |
22 | ${bindir}/cannelloni \ | 32 | |
33 | FILES:${PN}-cantest = " \ | ||
34 | ${bindir}/canbusload \ | ||
35 | ${bindir}/can-calc-bit-timing \ | ||
36 | ${bindir}/canfdtest \ | ||
37 | " | ||
38 | |||
39 | FILES:${PN}-isobusfs = " \ | ||
40 | ${bindir}/isobusfs-cli \ | ||
41 | ${bindir}/isobusfs-srv \ | ||
42 | ${libdir}/libisobusfs.so \ | ||
43 | " | ||
44 | |||
45 | FILES:${PN}-isobusfs-dev = " \ | ||
46 | ${includedir}/isobusfs* \ | ||
23 | " | 47 | " |
24 | 48 | ||
25 | FILES:${PN}-isotp = "${bindir}/isotp*" | 49 | FILES:${PN}-isotp = "${bindir}/isotp*" |
@@ -29,16 +53,14 @@ FILES:${PN}-j1939 = " \ | |||
29 | ${bindir}/testj1939 \ | 53 | ${bindir}/testj1939 \ |
30 | " | 54 | " |
31 | 55 | ||
32 | FILES:${PN}-cantest = " \ | 56 | FILES:${PN}-log = "${bindir}/*log*" |
33 | ${bindir}/canbusload \ | 57 | |
34 | ${bindir}/can-calc-bit-timing \ | 58 | FILES:${PN}-mcp251xfd = " \ |
35 | ${bindir}/canfdtest \ | 59 | ${bindir}/mcp251xfd* \ |
36 | " | 60 | " |
37 | 61 | ||
38 | FILES:${PN}-slcan = "${bindir}/slcan*" | 62 | FILES:${PN}-slcan = "${bindir}/slcan*" |
39 | 63 | ||
40 | FILES:${PN}-log = "${bindir}/*log*" | ||
41 | |||
42 | ALTERNATIVE:${PN} = "candump cansend cansequence" | 64 | ALTERNATIVE:${PN} = "candump cansend cansequence" |
43 | ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" | 65 | ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" |
44 | ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" | 66 | ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" |
@@ -46,5 +68,4 @@ ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" | |||
46 | 68 | ||
47 | # busybox ip fails to configure can interfaces, so we need iproute2 to do so. | 69 | # busybox ip fails to configure can interfaces, so we need iproute2 to do so. |
48 | # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. | 70 | # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. |
49 | RRECOMMENDS:${PN} += "iproute2" | 71 | RRECOMMENDS:${PN} += "iproute2-ip" |
50 | |||
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index ab4710e81f..b92b8086d6 100644 --- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb | |||
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
8 | DEPENDS = "libsocketcan" | 8 | DEPENDS = "libsocketcan" |
9 | 9 | ||
10 | SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" | 10 | SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" |
11 | SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \ | 11 | SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=https;branch=master \ |
12 | file://0001-canutils-candump-Add-error-frame-s-handling.patch \ | 12 | file://0001-canutils-candump-Add-error-frame-s-handling.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | inherit update-alternatives | 15 | inherit update-alternatives |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | ||
18 | 17 | ||
19 | inherit autotools pkgconfig | 18 | inherit autotools pkgconfig |
20 | 19 | ||
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb index 9f6ef85c87..535f37f84c 100644 --- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb +++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb | |||
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad | |||
7 | 7 | ||
8 | SRCREV = "077def398ad303043d73339112968e5112d8d7c8" | 8 | SRCREV = "077def398ad303043d73339112968e5112d8d7c8" |
9 | 9 | ||
10 | SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master" | 10 | SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=https;branch=master" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | ||
13 | 12 | ||
14 | inherit autotools pkgconfig | 13 | inherit autotools pkgconfig |
15 | 14 | ||
diff --git a/meta-oe/recipes-extended/socketcan/socketcand_git.bb b/meta-oe/recipes-extended/socketcan/socketcand_git.bb new file mode 100644 index 0000000000..ba69875c93 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/socketcand_git.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | SUMMARY = "Socketcand, socketcan over tcp/ip" | ||
2 | LICENSE = "GPL-2.0-only | BSD-3-Clause" | ||
3 | LIC_FILES_CHKSUM = " \ | ||
4 | file://LICENSES/BSD-3-Clause;md5=4c00cf8b0a04a9441d8fa24850231d00 \ | ||
5 | file://LICENSES/GPL-2.0-only.txt;md5=f9d20a453221a1b7e32ae84694da2c37 \ | ||
6 | " | ||
7 | |||
8 | SRC_URI = "git://github.com/linux-can/socketcand;branch=master;protocol=https" | ||
9 | SRCREV = "998b0394d028e791aa97d549bfc686b4fbadf5ee" | ||
10 | |||
11 | inherit meson pkgconfig | ||
12 | |||
13 | PACKAGECONFIG ?= "libconfig libsocketcan" | ||
14 | PACKAGECONFIG[libconfig] = "-Dlibconfig=true,-Dlibconfig=false,libconfig" | ||
15 | PACKAGECONFIG[libsocketcan] = "-Dlibsocketcan=true,-Dlibsocketcan=false,libsocketcan" | ||