meta-oniro-core/conf/distro/oniro-linux.conf

@@ -91,6 +91,11 @@ EFI_PROVIDER = "grub-efi"
 MACHINE_FEATURES:qemux86-64 += "efi"
 MACHINE_FEATURES:qemux86 += "efi"
 
+# Add bootindex to qemu boot device to prevent boot order from being changed in ovmf file
+# and not break boot order with EFI. See qemuboot.bbclass for more information
+QB_ROOTFS_EXTRA_OPT:qemux86-64 += ",bootindex=0"
+QB_ROOTFS_EXTRA_OPT:qemux86 += ",bootindex=0"
+
 # Install the grubenv file deployed by oniro-grub-bootconf package into the EFI partition.
 IMAGE_EFI_BOOT_FILES += "grubenv;EFI/BOOT/grubenv"
 

meta-oniro-staging/recipes-staging/kmod/kmod_%.bbappend

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+PACKAGECONFIG ??= "zlib xz"