From c97ebae788210c9d307ca823f63bb77d9029c6b0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 29 Feb 2012 05:41:17 +0000 Subject: image_types.bbclass: properly support IMAGE_LINK_NAME as empty [RP: Remove unneeded len()] (From OE-Core rev: 45a094372ea9e68888efee45d8e21cf2b7fa2df6) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/classes/image_types.bbclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 74071c1288..aeb69a4d5e 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -25,7 +25,9 @@ def get_imagecmds(d): types.append("ext3") types.remove("live") - cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*" + if d.getVar('IMAGE_LINK_NAME', True): + cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*" + for type in types: ccmd = [] subimages = [] @@ -55,10 +57,12 @@ runimagecmd () { # Now create the needed compressed versions cd ${DEPLOY_DIR_IMAGE}/ ${ccmd} - # And create the symlinks - for type in ${subimages}; do - ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type - done + # And create the symlinks + if [ -n "${IMAGE_LINK_NAME}" ]; then + for type in ${subimages}; do + ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type + done + fi } def imagetypes_getdepends(d): -- cgit v1.2.3-54-g00ecf