From bc0bc0504e8fa36b7f956e9dbb51fb72789ceb0c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 31 Mar 2023 01:27:24 +0200 Subject: runqemu: respect IMAGE_LINK_NAME * when searching for qemuboot.conf * don't assume that IMAGE_LINK_NAME is always - (with -.qemuboot.conf) * runqemu: use IMAGE_LINK_NAME set by testimage.bbclass or query with bitbake -e * testimage.bbclass was setting DEPLOY_DIR which I don't see used anywhere else, so I assume it was supposed to be DEPLOY_DIR_IMAGE as mentioned in corresponding runqemu code, do the same with IMAGE_LINK_NAME variable * add virtual/kernel as bitbake -e target in run_bitbake_env to make sure IMAGE_LINK_NAME is defined (kernel-artifact-names.bbclass inherits image-artifact-names.bbclass as well) * improve .qemuboot.conf search 1st search for file matching the rootfs and only when not found try again with .rootfs suffix removed [YOCTO #12937] (From OE-Core rev: 82b7a8d5e81d766d0a5c2d0fef0f4c13a8f80c31) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 716eb55bb963db7b02d985849cb025898aabc855) Signed-off-by: Steve Sakoman --- meta/classes-recipe/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index df22bb2344..b48cd96575 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -98,7 +98,7 @@ TESTIMAGELOCK:qemuall = "" TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" -TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR" +TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME" testimage_dump_target () { top -bn1 -- cgit v1.2.3-54-g00ecf