From 603d9dbfe4a7d0a12bb9f0b16e6fd576f4c2df0d Mon Sep 17 00:00:00 2001 From: Debbie Martin Date: Thu, 11 Apr 2024 09:48:09 +0000 Subject: [PATCH] arm-systemready: Change get_json_result_dir helper The get_testimage_json_result_dir helper in OE core was deleted in commit 01b1a6a5a4e7cede4d23a981b5144ae9c8306274 in preference for a common utility. Change the reference within the Arm SystemReady ACS log handler utlity. Signed-off-by: Debbie Martin Signed-off-by: Jon Mason --- meta-arm-systemready/classes/arm-systemready-acs.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-systemready/classes/arm-systemready-acs.bbclass b/meta-arm-systemready/classes/arm-systemready-acs.bbclass index 28e800c8..9dc3635d 100644 --- a/meta-arm-systemready/classes/arm-systemready-acs.bbclass +++ b/meta-arm-systemready/classes/arm-systemready-acs.bbclass @@ -86,7 +86,7 @@ do_testimage[depends] += "edk2-test-parser-native:do_populate_sysroot \ # Process the logs python acs_logs_handle() { import logging - from oeqa.utils import make_logger_bitbake_compatible + from oeqa.utils import make_logger_bitbake_compatible, get_json_result_dir import shutil deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE') @@ -117,7 +117,7 @@ python acs_logs_handle() { os.symlink(os.path.basename(logdir), loglink) # Create a top-level symlink to the acs_results directory - top_logdir = os.path.join(get_testimage_json_result_dir(d), d.getVar("PN")) + top_logdir = os.path.join(get_json_result_dir(d), d.getVar("PN")) log_name = d.getVar('ACS_LOG_NAME') top_link = os.path.join(top_logdir, log_name) log_target = os.path.relpath(logdir, top_logdir)