most: Fix build on 5.4 kernels

[AGL/meta-agl.git] / meta-agl-profile-core / recipes-kernel / most / most.bbappend

diff --git a/meta-agl-profile-core/recipes-kernel/most/most.bbappend b/meta-agl-profile-core/recipes-kernel/most/most.bbappend
index 17ad055..ad422eb 100644 (file)
--- a/meta-agl-profile-core/recipes-kernel/most/most.bbappend
+++ b/meta-agl-profile-core/recipes-kernel/most/most.bbappend
@@ -1,21 +1,6 @@
 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://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 \
@@ -25,7 +10,6 @@ SRC_URI_append = " \
         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"
+        file://0011-handle-snd_pcm_lib_mmap_vmalloc-removal.patch \
+        file://0012-Fix-build-with-5.4-kernel.patch \
+"