linux-oniro: Upgrade to 5.10.152

The linux-meta repository now includes (pulled from upsteam) the
fix-efi.cfg-drop-acpi-dependency.patch patch so we can drop it.

Fixes: linux#2



Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>

meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb

@@ -7,19 +7,18 @@ KMETA = "kernel-meta"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "452ea6a15ed2ac74789b7b3513777cc94ea3b751"
-SRCREV_meta ?= "3b283fa8d4068ff68457b93e07d321c6c06d37e0"
+SRCREV_machine ?= "b2303e799c734f00e2b3dc9e3af3ce92a2cd477e"
+SRCREV_meta ?= "dd90d836c062535cc2e8fff8c69959178215a552"
 
 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-efi.cfg-drop-acpi-dependency.patch;patchdir=${KMETA} \
 "
 
 require recipes-kernel/linux/linux-oniro-tweaks-all.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.61"
+LINUX_VERSION ?= "5.10.152"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native gmp-native"

meta-oniro-core/recipes-kernel/linux/linux/fix-efi.cfg-drop-acpi-dependency.patch

-From b6bb1d590565c188c7c7bfa7a202ede807616823 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@huawei.com>
-Date: Mon, 22 Aug 2022 13:45:59 +0200
-Subject: [PATCH] efi.cfg: Drop ACPI dependency
-
-On X86 this will have no impact as CONFIG_ACPI is enabled by default. On
-the other hand, ARM64 would be affected as they don't have the same
-default. The defconfig for arm64 recommends CONFIG_ACPI and this patch
-follows this recommendation in the qemuarm64 bsp configuration to fix
-ACPI-only EFI boots on this arch.
-
-arm (32bit) would also be unaffected as there is no ACPI support there
-at all. And this unconditional drop (CONFIG_ACPI) will actually fix a
-configuration warning when enabling EFI on a arm (32bit) machine:
-
-[INFO]: config 'CONFIG_ACPI' was set, but it wasn't assignable, check
-(parent) dependencies
-
-Upstream-status: Submitted [https://lists.yoctoproject.org/g/linux-yocto/message/11579] 
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
----
- bsp/qemuarm64/qemuarm64.cfg | 7 +++++++
- cfg/efi.cfg                 | 1 -
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg
-index ef8d3ed0..03fdc58c 100644
---- a/bsp/qemuarm64/qemuarm64.cfg
-+++ b/bsp/qemuarm64/qemuarm64.cfg
-@@ -32,3 +32,10 @@ CONFIG_RTC_DRV_PL031=y
- # PCI configs, needed for virtio-rng (and others)
- CONFIG_PCI=y
- CONFIG_PCI_HOST_GENERIC=y
-+
-+# arm64 defconfig suggests CONFIG_ACPI as default because it won't be enabled
-+# with CONFIG_EFI - even though ACPI-only ARM64 EFI boots would break
-+# otherwise. We also do the same here as a sane default.
-+CONFIG_ARCH_SUPPORTS_ACPI=y
-+CONFIG_ACPI=y
-+
-diff --git a/cfg/efi.cfg b/cfg/efi.cfg
-index d3dfd603..d729cbe9 100644
---- a/cfg/efi.cfg
-+++ b/cfg/efi.cfg
-@@ -3,7 +3,6 @@
-
- # Dependencies
- CONFIG_PCI=y
--CONFIG_ACPI=y
-
- # Enable basic EFI support
- CONFIG_EFI=y
---
-2.25.1

meta-oniro-core/recipes-kernel/linux/linux/fix-efi.cfg-drop-acpi-dependency.patch.license

-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: GPL-2.0-only