From 18d4144472a9f26d44f6a6356052b93fdc707b90 Mon Sep 17 00:00:00 2001 From: Luca Seritan <luca.seritan@huawei.com> Date: Wed, 10 Aug 2022 10:37:23 +0200 Subject: [PATCH] Drop qemuarm64 support The qemuarmi64 machine was never fully supported in Oniro due to its limitation in booting wic. Drop it completely. Signed-off-by: Luca Seritan <luca.seritan@huawei.com> --- docs/build-flavours/linux-flavour.rst | 1 - meta-oniro-core/conf/distro/oniro-linux.conf | 1 - meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/build-flavours/linux-flavour.rst b/docs/build-flavours/linux-flavour.rst index 01e478a5..823e8a87 100644 --- a/docs/build-flavours/linux-flavour.rst +++ b/docs/build-flavours/linux-flavour.rst @@ -22,7 +22,6 @@ Supported machines (default in **bold**): * **qemux86-64** * qemux86 -* qemuarm64 * seco-intel-b68 (SECO SBC-B68) * seco-imx8mm-c61-2gb (SECO SBC-C61 2GB DRAM) * seco-imx8mm-c61-4gb (SECO SBC-C61 4GB DRAM) diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index 82110172..f16630a7 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -68,7 +68,6 @@ TCLIBC ?= "musl" INIT_MANAGER = "systemd" PREFERRED_VERSION_linux-yocto = "5.10%" -PREFERRED_PROVIDER_virtual/kernel:qemuarm64 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemux86 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemux86-64 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemuarm-efi = "linux-oniro" 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 c40d663f..d453b72d 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 @@ -28,7 +28,7 @@ PROVIDES="linux-oniro virtual/kernel" KCONF_BSP_AUDIT_LEVEL = "1" -COMPATIBLE_MACHINE = "^(qemuarm64|qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$" +COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -- GitLab