From 73572f3847299bd2b1c53d5f7cb44bf740027343 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 4 May 2022 13:46:17 +0200
Subject: [PATCH] linux-yocto: Don't apply the plugins patch
The 5.10.109 version of linux-yocto comes with this patch included.
Avoid build error on trying to apply this patch on the linux-yocto*
recipes. Let the patch only apply to linux-oniro.
Fixes https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/546
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.../recipes-kernel/linux/linux-oniro-tweaks-all.inc | 2 --
meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro-tweaks-all.inc b/meta-oniro-core/recipes-kernel/linux/linux-oniro-tweaks-all.inc
index 5e3f4cba..79e75221 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-oniro-tweaks-all.inc
+++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro-tweaks-all.inc
@@ -4,8 +4,6 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
-SRC_URI += "file://fix-gcc-plugins-with-gcc-11.patch"
-
SRC_URI += "file://misc.cfg"
SRC_URI += "file://squashfs.cfg"
SRC_URI += "file://hardening_allocator.cfg"
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
index dded324f..6029e0f8 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
+++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
@@ -15,7 +15,9 @@ SRCREV_machine ?= "452ea6a15ed2ac74789b7b3513777cc94ea3b751"
SRCREV_meta ?= "3b283fa8d4068ff68457b93e07d321c6c06d37e0"
SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-core/linux.git;protocol=https;name=machine;branch=${KBRANCH}; \
- git://gitlab.eclipse.org/eclipse/oniro-core/linux-meta.git;type=kmeta;protocol=https;name=meta;branch=oniro/v5.10;destsuffix=${KMETA}"
+ git://gitlab.eclipse.org/eclipse/oniro-core/linux-meta.git;type=kmeta;protocol=https;name=meta;branch=oniro/v5.10;destsuffix=${KMETA} \
+ file://fix-gcc-plugins-with-gcc-11.patch \
+"
require recipes-kernel/linux/linux-oniro-tweaks-all.inc
--
GitLab