diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-25 17:07:31 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-06-03 15:29:22 +0200 |
commit | cdeae4218092cc3ea748cd07260b3198924f788d (patch) | |
tree | 4c0d95c21aaaf9687658e2ce701d0bde28c29c55 | |
parent | 6f0d16ddf3bbac1eea31683b262e866ec65fba2e (diff) | |
download | openembedded-core-contrib-cdeae4218092cc3ea748cd07260b3198924f788d.tar.gz |
images: respect IMAGE_NAME_SUFFIX also for *-testdata.json and *-qemuboot.conf files
* it might be cleaner to move these including the suffix into
image-artifacts.bbclass
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta/classes/image-live.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/qemuboot.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/syslinux.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/testexport.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/testimage.bbclass | 5 |
6 files changed, 17 insertions, 14 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 2c948190cf..c11a0ad898 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -130,14 +130,14 @@ build_iso() { if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then # PCBIOS only media mkisofs -V ${BOOTIMG_VOLUME_ID} \ - -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ + -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.iso \ -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ $mkisofs_compress_opts \ ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR} else # EFI only OR EFI+PCBIOS mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \ - -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ + -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.iso \ -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \ -eltorito-alt-boot -eltorito-platform efi \ @@ -146,7 +146,7 @@ build_iso() { isohybrid_args="-u" fi - isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso + isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.iso } build_fat_img() { @@ -238,13 +238,13 @@ build_hddimg() { fi fi - build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg + build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.hddimg if [ "${PCBIOS}" = "1" ]; then syslinux_hddimg_install fi - chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg + chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.hddimg fi } diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 2bde12748d..abd108485a 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -115,7 +115,7 @@ do_write_qemuboot_conf[vardepsexclude] += "TOPDIR" python do_write_qemuboot_conf() { import configparser - qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME')) + qemuboot = "%s/%s%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME'), d.getVar('IMAGE_NAME_SUFFIX')) qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME')) finalpath = d.getVar("DEPLOY_DIR_IMAGE") topdir = d.getVar('TOPDIR') diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2310e86cdf..c9d61349c8 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -333,7 +333,7 @@ python write_image_test_data() { deploy_dir = d.getVar('IMGDEPLOYDIR') link_name = d.getVar('IMAGE_LINK_NAME') - testdata_name = os.path.join(deploy_dir, "%s.testdata.json" % d.getVar('IMAGE_NAME')) + testdata_name = os.path.join(deploy_dir, "%s%s.testdata.json" % (d.getVar('IMAGE_NAME'), d.getVar('IMAGE_NAME_SUFFIX'))) searchString = "%s/"%(d.getVar("TOPDIR")).replace("//","/") export2json(d, testdata_name, searchString=searchString, replaceString="") diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 894f6b3718..fab7bc0972 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -72,7 +72,7 @@ syslinux_hddimg_populate() { } syslinux_hddimg_install() { - syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg + syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.hddimg } python build_syslinux_cfg () { diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 1b0fb44a4a..69cf45ba9d 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -49,8 +49,9 @@ def testexport_main(d): from oeqa.runtime.context import OERuntimeTestContext from oeqa.runtime.context import OERuntimeTestContextExecutor - image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + image_name = ("%s/%s%s" % (d.getVar('DEPLOY_DIR_IMAGE'), + d.getVar('IMAGE_NAME'), + d.getVar('IMAGE_NAME_SUFFIX'))) tdname = "%s.testdata.json" % image_name td = json.load(open(tdname, "r")) @@ -122,8 +123,9 @@ def copy_needed_files(d, tc): shutil.copy2(json_file, cases_path) # Copy test data - image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + image_name = ("%s/%s%s" % (d.getVar('DEPLOY_DIR_IMAGE'), + d.getVar('IMAGE_NAME'), + d.getVar('IMAGE_NAME_SUFFIX'))) image_manifest = "%s.manifest" % image_name tdname = "%s.testdata.json" % image_name test_data_path = os.path.join(export_path, 'data') diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 4db05a4af4..57f626e6b6 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -230,8 +230,9 @@ 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'))) + image_name = ("%s/%s%s" % (d.getVar('DEPLOY_DIR_IMAGE'), + d.getVar('IMAGE_NAME'), + d.getVar('IMAGE_NAME_SUFFIX'))) tdname = "%s.testdata.json" % image_name try: |