Patchwork [1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 29, 2012, 5:41 a.m.
Message ID <15cc019c1794bdc7151850ded06ddee579d69952.1330494042.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/22395/
State Accepted
Commit d0f1ae1f8cf8ef4e5adc24cc6246d3849e51aa98
Headers show

Comments

Otavio Salvador - Feb. 29, 2012, 5:41 a.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/image.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

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 () {
 write_image_manifest () {
 	rootfs_${IMAGE_PKGTYPE}_write_manifest
 
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
-        ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+	if [ -n "${IMAGE_LINK_NAME}" ]; then
+		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+		ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+	fi
 }
 
 # Make login manager(s) enable automatic login.