From 00ebe36af3caee262ee77549e89bedc92a4bd1f7 Mon Sep 17 00:00:00 2001
From: Luca Seritan <luca.seritan@huawei.com>
Date: Mon, 22 Aug 2022 17:58:29 +0200
Subject: [PATCH] linux-oniro: Add efi.cfg to machines that have the efi
feature
Machines that have the efi feature also need the efi kernel features, so
add these by default.
Signed-off-by: Luca Seritan <luca.seritan@huawei.com>
---
meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 00812962..3027af17 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
@@ -13,7 +13,7 @@ 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} \
file://fix-gcc-plugins-with-gcc-11.patch \
- file://fix-cfg.efi-drop-acpi-dependency.patch;patchdir=${KMETA} \
+ file://fix-efi.cfg-drop-acpi-dependency.patch;patchdir=${KMETA} \
"
require recipes-kernel/linux/linux-oniro-tweaks-all.inc
@@ -40,3 +40,4 @@ KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("MACHINE_FEATURES", "efi", " cfg/efi.scc", "", d)}"
--
GitLab