From f248658f416e64d127767c6d299018c2f59397d4 Mon Sep 17 00:00:00 2001 From: Luca Seritan <luca.seritan@huawei.com> Date: Wed, 10 Aug 2022 10:31:52 +0200 Subject: [PATCH] oniro-linux: Drop qemuarm support Signed-off-by: Luca Seritan <luca.seritan@huawei.com> --- meta-oniro-core/conf/distro/oniro-linux.conf | 1 - meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index 7157bd01..82110172 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:qemuarm = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemuarm64 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemux86 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemux86-64 = "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 9b7181a2..c40d663f 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 @@ -7,10 +7,6 @@ KMETA = "kernel-meta" require recipes-kernel/linux/linux-yocto.inc -# board-specific branches -KBRANCH:qemuarm ?= "oniro/v5.10/hw/qemuarm" - -SRCREV_machine:qemuarm ?= "b8d9461a3957dba555b1ae82481cf57f3ce9e8b1" SRCREV_machine ?= "452ea6a15ed2ac74789b7b3513777cc94ea3b751" SRCREV_meta ?= "3b283fa8d4068ff68457b93e07d321c6c06d37e0" @@ -32,7 +28,7 @@ PROVIDES="linux-oniro virtual/kernel" KCONF_BSP_AUDIT_LEVEL = "1" -COMPATIBLE_MACHINE = "^(qemuarm|qemuarm64|qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$" +COMPATIBLE_MACHINE = "^(qemuarm64|qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -- GitLab