[oe-commits] Ben Gardiner : image.bbclass: add link to .rootfs.<type> or .<type>.img
git version control
git at git.openembedded.org
Thu Mar 17 18:12:59 UTC 2011
Module: openembedded.git
Branch: 2011.03-maintenance
Commit: bea53b82ce187c30729efde6ea974aca5ee7f7d0
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bea53b82ce187c30729efde6ea974aca5ee7f7d0
Author: Ben Gardiner <bengardiner at nanometrics.ca>
Date: Thu Mar 17 00:50:34 2011 +0000
image.bbclass: add link to .rootfs.<type> or .<type>.img
The current image link-creation code will unconditionaly create a link
from .<type> pointing to the .rootfs.<type> output.
This is not compatible with the UBIFS images produced which have
.<type>.img extension since they are not considered to be valid rootfs
images when they are not included in a UBI container.
Check for existence of the link target .rootfs.<type> before creating the
link and fallback to a check for the .<type>.img target after that.
Signed-off-by: Ben Gardiner <bengardiner at nanometrics.ca>
Acked-by: Denys Dmytriyenko <denys at ti.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>
(cherry picked from commit cfde49e8d0f1cf09d589910f1a342849db148519)
Signed-off-by: Ben Gardiner <bengardiner at nanometrics.ca>
Acked-by: Denys Dmytriyenko <denys at ti.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>
---
classes/image.bbclass | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 9621614..d7fe9b0 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -140,7 +140,11 @@ def get_imagecmds(d):
cmd = "\t#Code for image type " + type + "\n"
cmd += "\t${IMAGE_CMD_" + type + "}\n"
cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n"
- cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n"
+ cmd += "\tif [ -f ${IMAGE_NAME}.rootfs." + type + " ]; then\n"
+ cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
+ cmd += "\telif [ -f ${IMAGE_NAME}." + type + ".img ]; then\n"
+ cmd += "\tln -fs ${IMAGE_NAME}." + type + ".img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
+ cmd += "\tfi\n\n"
cmds += bb.data.expand(cmd, localdata)
return cmds
More information about the Openembedded-commits
mailing list