From 89b7eef37589dc5c067a0ddf4ffaa12f245d4804 Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Sun, 30 Jun 2024 13:45:45 +0000 Subject: testimage: fallback for empty IMAGE_LINK_NAME if IMAGE_LINK_NAME is set empty to disable the symlinking for image artifacts in deploy, testimage fails, as the path assembly is incorrect. In that case fallback to IMAGE_NAME (From OE-Core rev: 1b026479e6d86d43d68ba26bed4b31dac91fc327) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie (cherry picked from commit c7a4e7e294992acc589c62adcaf6cd32659f2f9b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/testimage.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 2f68f83dfd..954c213912 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -110,7 +110,7 @@ TESTIMAGELOCK:qemuall = "" TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" -TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME" +TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME IMAGE_NAME" testimage_dump_monitor () { query-status @@ -208,7 +208,7 @@ def testimage_main(d): bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME'))) tdname = "%s.testdata.json" % image_name try: -- cgit v1.2.3-54-g00ecf