Merge branch 'develop'HEADmaster

Change-Id: I1c09bd80c8ba7b756c689c890b855b64bf3f7610

1 files changed, 21 insertions, 8 deletions

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index dd677f3..1a1edbc 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -4,18 +4,31 @@ require recipes-kernel/linux/linux-intel_5.10.bb
 require recipes-kernel/linux/linux-deploy-kconfig.inc
 require recipes-kernel/linux/linux-common-config.inc
 
-SRCREV_metaenea = "c930040f777c2546033b3fc55b475c0792ac62e9"
-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.
+# Note: these should be removed to bump kernel back to v5.10.78
+SRC_URI_remove = " \
+    file://0001-io-mapping-Cleanup-atomic-iomap.patch \
+"
+
+LINUX_VERSION = "5.10.35"
+SRCREV_machine = "0fd9e7f81ac665d77c40d5c4a3815e46d4d07e90"
+SRCREV_meta = "cd049697e9b2d3e9118110d476075ff8f87202cc"
+
+SRCREV_metaenea = "${AUTOREV}"
+SRC_URI_append = " git://${COREBASE}/../src/enea-kernel-cache;protocol=file;usehead=1;type=kmeta;name=metaenea;destsuffix=enea-kernel-meta"
+
 do_kernel_metadata_prepend() {
     ## ENEA_start ##
     # kernel-meta patching via patch files added to SRC_URI is currently broken, handle it here
+
+    # 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.
     sed -i -E 's/^(include features.aufs.*)$/# \1/g' ${WORKDIR}/kernel-meta/ktypes/standard/standard.scc
+
+    # Upstream yocto-kernel-cache adds a backported patch that meanwhile got upstreamed, but was not
+    # yet removed, causing patching conflicts. Until upstream cleans up this mess, handle it here.
+    sed -i -E 's/^(patch cgroup1-fix-leaked.*)$/# \1/g' ${WORKDIR}/kernel-meta/patches/misc/misc.scc
     ## ENEA_end ##
 }