Skip to contentSkip to conversation

can-isotp: Ignore in world builds

PATCH New Khem Raj 1 participant 2 messages Jul 16, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 can-isotp: Ignore in world builds

This now included in kernels 5.10+ so on master and linux-yocto we really do not need this recipe, but there still might be older kernels interfaced with meta-oe master, so they can still use it.

---
 meta-oe/recipes-extended/socketcan/can-isotp_git.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/socketcan/can-isotp_git.bb +2 -0
index 72d6757804..0278b53380 100644
@@ -15,3 +15,5 @@ EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
 do_install_append() {
     install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
 }
+
+EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/1 can-isotp: Upgrade to latest on master

From: David Sterling <[email protected]>

It is needed for 5.2 to 5.10 kernel

Can-isotp is now upstream from kernel 5.10 onwards.
Use kernel config file instead. This is only provided for legacy kernels.

For kernel 5.10 onwards use kernel defconfig option for ISO 15765-2 CAN transport and do not use can-isotp recipe. You will get "The file /usr/include/linux/can/isotp.h is installed by both linux-libc-headers and can-isotp" error using this recipe with kernel >= 5.10

---
 meta-oe/recipes-extended/socketcan/can-isotp_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/socketcan/can-isotp_git.bb +5 -2
index eca8dfc7b7..72d6757804 100644
@@ -1,14 +1,17 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931"
-SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59"
+SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608"
 PV = "1.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https"
 
+
 S = "${WORKDIR}/git"
 
 inherit module
 
 EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
 
-PNBLACKLIST[can-isotp] ?= "Kernel module Needs forward porting to kernel 5.2+"
+do_install_append() {
+    install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
+}
Signature · 1 line
2.32.0