From 6a05cb64dfafd531d50454ef7141ff0290d01ca9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 17 Jan 2016 11:16:45 +0000 Subject: bootimg/image: Enhance bootimg to respect RM_OLD_IMAGE Currently, iso and hddimg links don't respect RM_OLD_IMAGE. This updates them to use the common symlinks code so that they behave like the rest of the system. Signed-off-by: Richard Purdie --- meta/classes/bootimg.bbclass | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'meta/classes/bootimg.bbclass') diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index ec9d0b7d52..ed9afb92f6 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -172,10 +172,6 @@ build_iso() { fi isohybrid $isohybrid_args ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.iso - ln -s ${IMAGE_NAME}.iso ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.iso } build_fat_img() { @@ -280,10 +276,6 @@ build_hddimg() { fi chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg - ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg fi } @@ -294,7 +286,10 @@ python do_bootimg() { bb.build.exec_func('build_efi_cfg', d) bb.build.exec_func('build_hddimg', d) bb.build.exec_func('build_iso', d) + bb.build.exec_func('create_symlinks', d) } +do_bootimg[subimages] = "hddimg iso" +do_bootimg[imgsuffix] = "." IMAGE_TYPEDEP_iso = "ext4" IMAGE_TYPEDEP_hddimg = "ext4" -- cgit v1.2.3