X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-core%2Frecipes-kernel%2Fmost%2Fmost.bbappend;h=17ad055855bedbf5f22474b1e1ac386702def1d5;hb=d6ea4202a437019e32b7e78604ef060e267b142d;hp=d85565fc28b310adab1d554c2745ee3698c85cf2;hpb=b43165328658087277b667152fdbc04fe07cba08;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-profile-core/recipes-kernel/most/most.bbappend b/meta-agl-profile-core/recipes-kernel/most/most.bbappend
index d85565fc2..17ad05585 100644
--- a/meta-agl-profile-core/recipes-kernel/most/most.bbappend
+++ b/meta-agl-profile-core/recipes-kernel/most/most.bbappend
@@ -1,12 +1,31 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
+def prep_version (d) :
+    KV = d.getVar('KERNEL_VERSION', True)
+    if not KV :
+        return "4.12"
+    else:
+        return KV
+
+ORIG_KERN_VER = "${@prep_version(d)}"
+
+VANILLA_KERNEL_VERSION = "${@str(ORIG_KERN_VER.split("-")[0].split(".")[0]+ORIG_KERN_VER.split("-")[0].split(".")[1])}"
+
+APPLY = "${@str('no' if ${VANILLA_KERNEL_VERSION} > 412 else 'yes')}"
+APPLY_419 = "${@str('no' if ${VANILLA_KERNEL_VERSION} < 419 else 'yes')}"
+
 SRC_URI_append = " \
-	    file://0002-src-most-add-auto-conf-feature.patch \ 
-	    file://0003-core-remove-kernel-log-for-MBO-status.patch \
-	    file://0004-most-video-set-device_caps.patch \
-	    file://0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch \
-	    file://0006-dim2-fix-startup-sequence.patch \
-	    file://0007-dim2-use-device-tree.patch \
-	    file://0008-dim2-read-clock-speed-from-the-device-tree.patch \
-	    file://0009-dim2-use-device-for-coherent-memory-allocation.patch \
-	   "
+        file://0001-most-aim-network-backport-Kernel-API.patch;apply=${APPLY} \
+        file://0002-src-most-add-auto-conf-feature.patch \
+        file://0003-core-remove-kernel-log-for-MBO-status.patch \
+        file://0004-most-video-set-device_caps.patch \
+        file://0005-most-video-set-V4L2_CAP_DEVICE_CAPS-flag.patch \
+        file://0006-dim2-fix-startup-sequence.patch \
+        file://0007-dim2-use-device-tree.patch \
+        file://0008-dim2-read-clock-speed-from-the-device-tree.patch \
+        file://0009-dim2-use-device-for-coherent-memory-allocation.patch \
+        file://0010-backport-usb-setup-timer.patch \
+        file://0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch;apply=${APPLY_419} \
+       "
+# Make sure we can expose KERNEL_VERSION ...
+do_patch[depends] += "virtual/kernel:do_populate_sysroot"