[OE-core] [PATCH] boot-directdisk: fix the support of vmdk

[Paul Eggleton]

On Friday 20 December 2013 12:32:38 Martin Jansa wrote:
> On Fri, Dec 20, 2013 at 08:10:24AM -0200, Joao Henrique Ferreira de Freitas
> wrote:
> > Previous change (086ce22b88f5ef5f75a83119a32c8b3fdcfa296d) broke
> > the creating of vmdk images. This protects shell expansion variables
> > and let dd generate the image to be transformed to vmdk by
> > image-vmdk.class. ---
> > 
> >  meta/classes/boot-directdisk.bbclass | 16 ++++++----------
> >  1 file changed, 6 insertions(+), 10 deletions(-)
> > 
> > diff --git a/meta/classes/boot-directdisk.bbclass
> > b/meta/classes/boot-directdisk.bbclass index 3277666..4f26f47 100644
> > --- a/meta/classes/boot-directdisk.bbclass
> > +++ b/meta/classes/boot-directdisk.bbclass
> > @@ -88,10 +88,10 @@ build_boot_dd() {
> > 
> >  		grubefi_hddimg_populate $HDDDIR
> >  	
> >  	fi
> > 
> > -	if [ ${IMAGE_FSTYPE} = "vmdk" ]; then
> > -		if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then
> > +	if [ "${IMAGE_FSTYPES}" = "vmdk" ]; then
> > +		if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
> 
> IMAGE_FSTYPE looks really as typo, but what if there are multiple
> entries in IMAGE_FSTYPES?
> 
> OE @ ~/openembedded-core $ git grep IMAGE_FSTYPE | grep -v IMAGE_FSTYPES
> meta/classes/boot-directdisk.bbclass:   if [ ${IMAGE_FSTYPE} = "vmdk" ];
> then meta/classes/boot-directdisk.bbclass:   if [ ${IMAGE_FSTYPE} != "vmdk"
> ]; then meta/classes/boot-directdisk.bbclass:   if [ ${IMAGE_FSTYPE} !=
> "vmdk" ]; then
> 
> Maybe you can use this variable instead:
> meta/classes/image.bbclass:IMAGE_TYPE_vmdk =
> '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}'

I'd suggest not using that variable as it's an internal implementation detail 
of image.bbclass - just use a similar base_contains() statement.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre