summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-02-29 05:41:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-29 12:56:44 (GMT)
commit05c7d5d512a56e72ea4e707c16d27dfd89c9b280 (patch)
tree0fa92e430a0fcef714b70b6a4f1fed187e7ff31d
parenta4624063edaa1861022daaf946ec06ba9add900e (diff)
downloadpoky-05c7d5d512a56e72ea4e707c16d27dfd89c9b280.tar.gz
image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty
(From OE-Core rev: d0f1ae1f8cf8ef4e5adc24cc6246d3849e51aa98) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4db55ff..ec75cc1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -322,8 +322,10 @@ make_zimage_symlink_relative () {
322write_image_manifest () { 322write_image_manifest () {
323 rootfs_${IMAGE_PKGTYPE}_write_manifest 323 rootfs_${IMAGE_PKGTYPE}_write_manifest
324 324
325 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest 325 if [ -n "${IMAGE_LINK_NAME}" ]; then
326 ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest 326 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
327 ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
328 fi
327} 329}
328 330
329# Make login manager(s) enable automatic login. 331# Make login manager(s) enable automatic login.