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

login
register
mail settings
Submitter Ting Liu
Date Jan. 16, 2014, 7:13 a.m.
Message ID <1389856402-4591-2-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/64947/
State Accepted
Headers show

Comments

Ting Liu - Jan. 16, 2014, 7:13 a.m.
From: Zhenhua Luo <zhenhua.luo@freescale.com>

| /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

Fixed [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
Zhenhua Luo - Jan. 21, 2014, 3:45 a.m.
Applied, thanks. 


Best Regards,

Zhenhua


> -----Original Message-----
> From: b28495@freescale.com [mailto:b28495@freescale.com]
> Sent: Thursday, January 16, 2014 3:13 PM
> To: meta-freescale@yoctoproject.org
> Cc: Luo Zhenhua-B19537; Liu Ting-B28495
> Subject: [meta-fsl-ppc][dylan][PATCH] u-boot: fix depend race issue of u-
> boot-NAND.bin build
> 
> From: Zhenhua Luo <zhenhua.luo@freescale.com>
> 
> | /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/P10
> | 22DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2
> 
> Fixed [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
> 
> 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-pp
> +| c/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P
> +| 1022DS_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 773834f..67bd1d5 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 libgcc
> ${@base_contains('TCMODE', 'external-fsl',
> 
>  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 = "5438fc1ca159c8f5724272efd1289e6d49771e69"
> 
>  python () {
> --
> 1.7.9.7
>

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 773834f..67bd1d5 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 libgcc ${@base_contains('TCMODE', 'external-fsl',
 
 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 = "5438fc1ca159c8f5724272efd1289e6d49771e69"
 
 python () {