diff options
| author | Konrad Weihmann <kweihmann@outlook.com> | 2024-07-03 04:47:10 +0000 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-10-02 06:15:15 -0700 |
| commit | 2b073f0eaa1c9e7918c177af2452a210924b5be2 (patch) | |
| tree | 9e4e754cf9386d991c650e897400ea807ea87d06 | |
| parent | 89b7eef37589dc5c067a0ddf4ffaa12f245d4804 (diff) | |
| download | poky-2b073f0eaa1c9e7918c177af2452a210924b5be2.tar.gz | |
testexport: fallback for empty IMAGE_LINK_NAME
if IMAGE_LINK_NAME is set empty to disable the symlinking
for image artifacts in deploy, testexport fails, as the path assembly
is incorrect.
In that case fallback to IMAGE_NAME
(From OE-Core rev: bd723b611e937b8532ebcd485db61a3eae46091d)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0c1d098e6dd08fa3a5aafca656457ac6badcef89)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes-recipe/testexport.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/testexport.bbclass b/meta/classes-recipe/testexport.bbclass index 572f5d9e76..57f7f15885 100644 --- a/meta/classes-recipe/testexport.bbclass +++ b/meta/classes-recipe/testexport.bbclass | |||
| @@ -50,7 +50,7 @@ def testexport_main(d): | |||
| 50 | from oeqa.runtime.context import OERuntimeTestContextExecutor | 50 | from oeqa.runtime.context import OERuntimeTestContextExecutor |
| 51 | 51 | ||
| 52 | image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), | 52 | image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), |
| 53 | d.getVar('IMAGE_LINK_NAME'))) | 53 | d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME'))) |
| 54 | 54 | ||
| 55 | tdname = "%s.testdata.json" % image_name | 55 | tdname = "%s.testdata.json" % image_name |
| 56 | td = json.load(open(tdname, "r")) | 56 | td = json.load(open(tdname, "r")) |