linux-intel: Remove duplicate upstreamed patch

yocto-kernel-cache added in [1] a patch backport. However,
it was included upstream in [2], which will get pulled in when the
kernel version will be bumped later on, ending up duplicating the
change, causing do_patch failures during build.

Until upstream cleans up the duplicate, handle it explicitly.

[1] https://git.yoctoproject.org/yocto-kernel-cache/commit/\
    ?h=yocto-5.10&id=67dad5ca86bd47dbbaa2194b9854c228055dfd37
[2] https://github.com/intel/linux-intel-lts/commit/df34f8886

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: Ib9c409a7ad7892344ae91922cf0bfa8b36500f19

1 files changed, 9 insertions, 4 deletions

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index dd677f3..10af6ca 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -8,14 +8,19 @@ 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.
 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 ##
 }