rauc,oniro-bundle-base: add constants for QEMU ARM

The new QEMU ARM machines all use EFI/GRUB and act and behave like a typcal
x86_64 box would. In addition, re-order the entries so that physical machines
and virtual machines are clustered together, and in the same order.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>

meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb

@@ -6,10 +6,12 @@ inherit bundle
 
 SUMMARY = "SysOTA/RAUC Update Bundle for Oniro Base Image"
 
-RAUC_BUNDLE_COMPATIBLE:qemux86 = "QEMU x86"
-RAUC_BUNDLE_COMPATIBLE:qemux86-64 = "QEMU x86-64"
 RAUC_BUNDLE_COMPATIBLE:raspberrypi4-64 = "Raspberry Pi 4"
 RAUC_BUNDLE_COMPATIBLE:seco-intel-b68 := "SECO Alvin"
+RAUC_BUNDLE_COMPATIBLE:qemux86 = "QEMU x86"
+RAUC_BUNDLE_COMPATIBLE:qemux86-64 = "QEMU x86-64"
+RAUC_BUNDLE_COMPATIBLE:qemuarm-efi = "QEMU ARM (EFI)"
+RAUC_BUNDLE_COMPATIBLE:qemuarm64-efi = "QEMU ARM64 (EFI)"
 # TODO: add compatibility strings for other machines.
 
 RAUC_BUNDLE_DESCRIPTION = "SysOTA/RAUC Update Bundle"

meta-oniro-core/recipes-core/rauc/rauc_%.bbappend

@@ -25,6 +25,10 @@ RAUC_COMPAT:raspberrypi4-64 := "Raspberry Pi 4"
 RAUC_SLOT_A:raspberrypi4-64 := "/dev/mmcblk0p2"
 RAUC_SLOT_B:raspberrypi4-64 := "/dev/mmcblk0p3"
 
+RAUC_COMPAT:seco-intel-b68 := "SECO Alvin"
+RAUC_SLOT_A:seco-intel-b68 := "/dev/sda2"
+RAUC_SLOT_B:seco-intel-b68 := "/dev/sda3"
+
 RAUC_COMPAT:qemux86 := "QEMU x86"
 RAUC_SLOT_A:qemux86 := "/dev/sda2"
 RAUC_SLOT_B:qemux86 := "/dev/sda3"
@@ -33,9 +37,13 @@ RAUC_COMPAT:qemux86-64 := "QEMU x86-64"
 RAUC_SLOT_A:qemux86-64 := "/dev/sda2"
 RAUC_SLOT_B:qemux86-64 := "/dev/sda3"
 
-RAUC_COMPAT:seco-intel-b68 := "SECO Alvin"
-RAUC_SLOT_A:seco-intel-b68 := "/dev/sda2"
-RAUC_SLOT_B:seco-intel-b68 := "/dev/sda3"
+RAUC_COMPAT:qemuarm-efi:= "QEMU ARM (EFI)"
+RAUC_SLOT_A:qemuarm-efi := "/dev/sda2"
+RAUC_SLOT_B:qemuarm-efi := "/dev/sda3"
+
+RAUC_COMPAT:qemuarm64-efi:= "QEMU ARM64 (EFI)"
+RAUC_SLOT_A:qemuarm64-efi := "/dev/sda2"
+RAUC_SLOT_B:qemuarm64-efi := "/dev/sda3"
 
 do_install:prepend() {
     sed \