From b58dfcda544bdf13acfd27c034a817bf719a60c9 Mon Sep 17 00:00:00 2001
From: David Sterling <david-sterling@users.noreply.github.com>
Date: Mon, 28 Jun 2021 13:38:30 +0200
Subject: [PATCH 1/2] Working 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.
---
 .../recipes-extended/socketcan/can-isotp_git.bb   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
index eca8dfc7b7d..b92b62cbdbd 100644
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
@@ -1,14 +1,21 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931"
-SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59"
-PV = "1.0+git${SRCPV}"
+SRCREV = "${AUTOREV}"
+inherit module
 
+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+"
+inherit module
+
+#/linux/can/isotp.h is the include used in most examples, feel free to change 
+
+do_install_append() {
+    install -d ${D}${includedir}/linux/can/
+    install -m 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
+}

From 1af54898e44709b20401ae47374ee1aae8df1da9 Mon Sep 17 00:00:00 2001
From: David Sterling <david-sterling@users.noreply.github.com>
Date: Tue, 13 Jul 2021 12:30:41 +0200
Subject: [PATCH 2/2] Updated master branch hartkopp can iso-tp works kernel
 5.2 to 5.10

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
---
 .../recipes-extended/socketcan/can-isotp_git.bb    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
index b92b62cbdbd..72d67578041 100644
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
@@ -1,21 +1,17 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931"
-SRCREV = "${AUTOREV}"
-inherit module
-
+SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608"
 PV = "1.0+git${SRCPV}"
-SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https"
 
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https"
 
 
-EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
+S = "${WORKDIR}/git"
 
 inherit module
 
-#/linux/can/isotp.h is the include used in most examples, feel free to change 
+EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
 
 do_install_append() {
-    install -d ${D}${includedir}/linux/can/
-    install -m 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
+    install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
 }