Patchwork [meta-fsl-arm] image_types_fsl: fix barebox bootstream generation

login
register
mail settings
Submitter Alexandre Belloni
Date Feb. 27, 2014, 9:55 a.m.
Message ID <1393494927-22172-1-git-send-email-alexandre.belloni@free-electrons.com>
Download mbox | patch
Permalink /patch/67577/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Alexandre Belloni - Feb. 27, 2014, 9:55 a.m.
Since the image_types.bbclass is not cd'ing to ${DEPLOY_DIR_IMAGE}
anymore, do that in a subshell before generating the boostream.
This fixes the following build failure:

ERROR: Error: The image creation script '/home/build/yocto/cfa/tmp/work/cfa10058-poky-linux-gnueabi/core-image-minimal/1.0-r0/temp/create_image.barebox.mxsboot-sdcard' returned 1:
error: unable to find command file imx-bootlets-barebox_ivt.bd-cfa10058

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 classes/image_types_fsl.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Alexandre Belloni - Feb. 27, 2014, 10:14 a.m.
Just as a note, Someone should probably have a look at doing something
similar for linux.sb but I didn't take the time to test it.

On 27/02/2014 at 10:55:27 +0100, Alexandre Belloni wrote :
> Since the image_types.bbclass is not cd'ing to ${DEPLOY_DIR_IMAGE}
> anymore, do that in a subshell before generating the boostream.
> This fixes the following build failure:
> 
> ERROR: Error: The image creation script '/home/build/yocto/cfa/tmp/work/cfa10058-poky-linux-gnueabi/core-image-minimal/1.0-r0/temp/create_image.barebox.mxsboot-sdcard' returned 1:
> error: unable to find command file imx-bootlets-barebox_ivt.bd-cfa10058
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>  classes/image_types_fsl.bbclass | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
> index fd2effd2be64..f0160dfe93be 100644
> --- a/classes/image_types_fsl.bbclass
> +++ b/classes/image_types_fsl.bbclass
> @@ -42,9 +42,9 @@ IMAGE_CMD_barebox.mxsboot-sdcard () {
>  	barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE}
>  
>  	# Ensure the files are generated
> -	rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard
> -	elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb
> -	mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard
> +	(cd ${DEPLOY_DIR_IMAGE}; rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard; \
> +	 elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb; \
> +	 mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard)
>  }
>  
>  # U-Boot mxsboot generation to SD-Card
> -- 
> 1.8.3.2
>
Daiane Angolini - Feb. 27, 2014, 2:16 p.m.
> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Alexandre Belloni
> Sent: Thursday, February 27, 2014 7:15 AM
> To: meta-freescale@yoctoproject.org
> Cc: Maxime Ripard; jimwall@q.com
> Subject: Re: [meta-freescale] [meta-fsl-arm][PATCH] image_types_fsl: fix
> barebox bootstream generation
> 
> Just as a note, Someone should probably have a look at doing something
> similar for linux.sb but I didn't take the time to test it.


Would be the case to add a #FIXME note in your piece of code?

Daiane
Alexandre Belloni - Feb. 27, 2014, 2:20 p.m.
On 27/02/2014 at 14:16:55 +0000, Daiane.Angolini@freescale.com wrote :
> 
> 
> > -----Original Message-----
> > From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> > bounces@yoctoproject.org] On Behalf Of Alexandre Belloni
> > Sent: Thursday, February 27, 2014 7:15 AM
> > To: meta-freescale@yoctoproject.org
> > Cc: Maxime Ripard; jimwall@q.com
> > Subject: Re: [meta-freescale] [meta-fsl-arm][PATCH] image_types_fsl: fix
> > barebox bootstream generation
> > 
> > Just as a note, Someone should probably have a look at doing something
> > similar for linux.sb but I didn't take the time to test it.
> 
> 
> Would be the case to add a #FIXME note in your piece of code?
> 

I guess, Otavio will have a look quickly. Maybe this is not broken I'm
not sure it is worth saying it is broken if it isn't ;)
Daiane Angolini - Feb. 27, 2014, 3:27 p.m.
> -----Original Message-----
> From: Alexandre Belloni [mailto:alexandre.belloni@free-electrons.com]
> Sent: Thursday, February 27, 2014 11:20 AM
> To: Angolini Daiane-B19406
> Cc: meta-freescale@yoctoproject.org; Maxime Ripard; jimwall@q.com
> Subject: Re: [meta-freescale] [meta-fsl-arm][PATCH] image_types_fsl: fix
> barebox bootstream generation
> 
> On 27/02/2014 at 14:16:55 +0000, Daiane.Angolini@freescale.com wrote :
> >
> >
> > > -----Original Message-----
> > > From: meta-freescale-bounces@yoctoproject.org
> > > [mailto:meta-freescale- bounces@yoctoproject.org] On Behalf Of
> > > Alexandre Belloni
> > > Sent: Thursday, February 27, 2014 7:15 AM
> > > To: meta-freescale@yoctoproject.org
> > > Cc: Maxime Ripard; jimwall@q.com
> > > Subject: Re: [meta-freescale] [meta-fsl-arm][PATCH] image_types_fsl:
> > > fix barebox bootstream generation
> > >
> > > Just as a note, Someone should probably have a look at doing
> > > something similar for linux.sb but I didn't take the time to test it.
> >
> >
> > Would be the case to add a #FIXME note in your piece of code?
> >
> 
> I guess, Otavio will have a look quickly. Maybe this is not broken I'm not
> sure it is worth saying it is broken if it isn't ;)
> 

Perfect ;)

Daiane

Patch

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index fd2effd2be64..f0160dfe93be 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -42,9 +42,9 @@  IMAGE_CMD_barebox.mxsboot-sdcard () {
 	barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE}
 
 	# Ensure the files are generated
-	rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard
-	elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb
-	mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard
+	(cd ${DEPLOY_DIR_IMAGE}; rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard; \
+	 elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb; \
+	 mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard)
 }
 
 # U-Boot mxsboot generation to SD-Card