From daa6afead84588f8b302228b581498f492d21d38 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Mar 2024 16:49:59 +0000 Subject: classes/qemuboot: add depends on qemu-system-native and qemu-helper-native Any image that inherits qemuboot must also add image dependencies on qemu-system-native and qemu-helper-native, otherwise the image won't be able to be booted. Currently this is done by conf/machine/include/qemu.inc, but not every machine that uses qemuboot includes that file. Move the EXTRA_IMAGEDEPENDS from qemu.inc into qemuboot.bbclass, so that the dependencies don't have to be duplicated. (From OE-Core rev: dd54cf058f632e985917ff227483995f368e6a7d) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/qemuboot.bbclass | 2 ++ meta/conf/machine/include/qemu.inc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass index 4a563b8ccc..895fd38d68 100644 --- a/meta/classes-recipe/qemuboot.bbclass +++ b/meta/classes-recipe/qemuboot.bbclass @@ -185,3 +185,5 @@ python do_write_qemuboot_conf() { os.remove(qemuboot_link) os.symlink(os.path.basename(qemuboot), qemuboot_link) } + +EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 14feb86790..bb7aec7675 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -23,8 +23,6 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot" - # Provide the nfs server kernel module for all qemu images KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -- cgit v1.2.3-54-g00ecf