1 files changed, 14 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 366d57d..dbc9808 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -11,6 +11,20 @@ SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a"
 KENEABRANCH = "intel-5.10"
 SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta"
 
+# Upstream BSPs include aufs support (by patching the kernel source + enabling it in kernel config).
+# However, our current kernel version contains a backported commit that conflicts with aufs patches.
+# Until aufs patches are rebased in yocto-kernel-cache, disable aufs kernel source patching, since
+# we don't enable it via kernel config anyway.
+do_kernel_metadata_prepend() {
+    ## ENEA_start ##
+    # kernel-meta patching via patch files added to SRC_URI is currently broken, handle it here
+    sed -i -E 's/^(include features.aufs.*)$/# \1/g' ${WORKDIR}/kernel-meta/ktypes/standard/standard.scc
+    ## ENEA_end ##
+}
+
+# Allow BSPs to supply patches without explicitly adding the scc files to SRC_URI/KERNEL_FEATURES
+KMETA_EXTERNAL_BSPS = "t"
+
 # KERNEL CONFIG DEFAULT CHECK LEVELS:
 #   0: no reporting
 #   1: report options that are specified, but not in the final config