summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-02-29 05:41:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-29 12:56:44 (GMT)
commitc97ebae788210c9d307ca823f63bb77d9029c6b0 (patch)
tree090e2ec2470772bca4af501a16086dd054f14242
parent05c7d5d512a56e72ea4e707c16d27dfd89c9b280 (diff)
downloadpoky-c97ebae788210c9d307ca823f63bb77d9029c6b0.tar.gz
image_types.bbclass: properly support IMAGE_LINK_NAME as empty
[RP: Remove unneeded len()] (From OE-Core rev: 45a094372ea9e68888efee45d8e21cf2b7fa2df6) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 74071c1..aeb69a4 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -25,7 +25,9 @@ def get_imagecmds(d):
25 types.append("ext3") 25 types.append("ext3")
26 types.remove("live") 26 types.remove("live")
27 27
28 cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*" 28 if d.getVar('IMAGE_LINK_NAME', True):
29 cmds += " rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"
30
29 for type in types: 31 for type in types:
30 ccmd = [] 32 ccmd = []
31 subimages = [] 33 subimages = []
@@ -55,10 +57,12 @@ runimagecmd () {
55 # Now create the needed compressed versions 57 # Now create the needed compressed versions
56 cd ${DEPLOY_DIR_IMAGE}/ 58 cd ${DEPLOY_DIR_IMAGE}/
57 ${ccmd} 59 ${ccmd}
58 # And create the symlinks 60 # And create the symlinks
59 for type in ${subimages}; do 61 if [ -n "${IMAGE_LINK_NAME}" ]; then
60 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type 62 for type in ${subimages}; do
61 done 63 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
64 done
65 fi
62} 66}
63 67
64def imagetypes_getdepends(d): 68def imagetypes_getdepends(d):