On Tue, Mar 15, 2011 at 02:13:54PM -0400, Ben Gardiner wrote: > 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 <[email protected]> > CC: Tom Rini <[email protected]>
The naming seems reasonable to me, considering the previous discussion on this topic. Acked-by: Denys Dmytriyenko <[email protected]> > Tested successfully in arago; I'm sorry I couldn't find a combination of > MACHINE and DISTRO and image that would build on org.openembedded.dev. > > This patch is a git am fix-up of the patch tested in arago. I'll try building it from the tip of oe.dev, but arago should be reasonable up to date with no changes to image.bbclass or bitbake.conf... > --- > > 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 > > -- > 1.7.1 > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
