Patchwork [meta-fsl-ppc] u-boot: fix depend race issue of u-boot-NAND.bin build

login
register
mail settings
Submitter Zhenhua Luo
Date Sept. 24, 2013, 6:24 a.m.
Message ID <1380003871-7717-1-git-send-email-zhenhua.luo@freescale.com>
Download mbox | patch
Permalink /patch/58631/
State Accepted
Headers show

Comments

Zhenhua Luo - Sept. 24, 2013, 6:24 a.m.
| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator.  Stop.
| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2

Address [Bug 5239].

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 .../u-boot/files/Fix-the-depend-race-issue.patch   |   38 ++++++++++++++++++++
 recipes-bsp/u-boot/u-boot_git.bb                   |    3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
Otavio Salvador - Sept. 24, 2013, 11:49 a.m.
On Tue, Sep 24, 2013 at 3:24 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
> | /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator.  Stop.
> | make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
> | make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2
>
> Address [Bug 5239].

Fixes [YOCTO: 5239]

> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>

Apart from that, it is good :-)

Thanks for looking at this.
Zhenhua Luo - Sept. 24, 2013, 12:59 p.m.
Changed the word and applied, thanks. 


Best Regards,

Zhenhua

> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On
> Behalf Of Otavio Salvador
> Sent: Tuesday, September 24, 2013 7:49 PM
> To: Luo Zhenhua-B19537
> Cc: meta-freescale@yoctoproject.org; Wu Yi-Yang-B28405; Yu Zongchun-
> B40527
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH] u-boot: fix depend
> race issue of u-boot-NAND.bin build
> 
> On Tue, Sep 24, 2013 at 3:24 AM, Zhenhua Luo <zhenhua.luo@freescale.com>
> wrote:
> > | /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-
> ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-
> r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: ***
> missing separator.  Stop.
> > | make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-
> new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-
> gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
> > | make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-
> slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-
> boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error
> 2
> >
> > Address [Bug 5239].
> 
> Fixes [YOCTO: 5239]
> 
> > Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> 
> Apart from that, it is good :-)
> 
> Thanks for looking at this.
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Patch

diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
new file mode 100644
index 0000000..1ddc667
--- /dev/null
+++ b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
@@ -0,0 +1,38 @@ 
+Upstream-Status: Pending
+
+From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001
+From: Zhenhua Luo <zhenhua.luo@freescale.com>
+Date: Tue, 24 Sep 2013 00:54:40 -0500
+Subject: [PATCH] Fix the depend race issue
+
+| make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
+| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator.  Stop.
+| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
+| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2
+| make[2]: *** Waiting for unfinished jobs....
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+---
+ spl/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/spl/Makefile b/spl/Makefile
+index 6dbb105..3156d87 100644
+--- a/spl/Makefile
++++ b/spl/Makefile
+@@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS)))
+ $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend
+ 	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
+ 
+-depend:	$(obj).depend
++# Explicitly make _depend in subdirs containing multiple targets to prevent
++# parallel sub-makes creating .depend files simultaneously.
++depend dep:	$(obj).depend
++		for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \
++			$(MAKE) -C $(SRCTREE)/$$dir _depend ; done
+ .PHONY: depend
+ 
+ # defines $(obj).depend target
+-- 
+1.8.2.1
+
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 008e253..3479b23 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -11,7 +11,8 @@  DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \
+	file://Fix-the-depend-race-issue.patch"
 SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
 
 python () {