diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2012-02-29 05:41:17 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-29 12:55:41 +0000 |
| commit | 45a094372ea9e68888efee45d8e21cf2b7fa2df6 (patch) | |
| tree | 66f8515ee7f12f4f743d47792c60f0577f1e2225 /meta | |
| parent | d0f1ae1f8cf8ef4e5adc24cc6246d3849e51aa98 (diff) | |
| download | openembedded-core-contrib-45a094372ea9e68888efee45d8e21cf2b7fa2df6.tar.gz | |
image_types.bbclass: properly support IMAGE_LINK_NAME as empty
[RP: Remove unneeded len()]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types.bbclass | 14 |
1 files 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): |