diff options
| author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-01-16 01:13:22 -0600 |
|---|---|---|
| committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-01-21 11:44:09 +0800 |
| commit | 89fd3b4d112c381147c67b7669d4d46deb46d818 (patch) | |
| tree | dc5a20341c964c9c7eb311abb74bcbe62fbedd8b | |
| parent | b7762989e92ebf24737ddcc8b0cfee72f6f03cbd (diff) | |
| download | meta-fsl-ppc-89fd3b4d112c381147c67b7669d4d46deb46d818.tar.gz | |
u-boot: fix depend race issue of u-boot-NAND.bin build
| /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>
| -rw-r--r-- | recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch | 38 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot_git.bb | 3 |
2 files changed, 40 insertions, 1 deletions
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 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
| 5 | Date: Tue, 24 Sep 2013 00:54:40 -0500 | ||
| 6 | Subject: [PATCH] Fix the depend race issue | ||
| 7 | |||
| 8 | | 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' | ||
| 9 | | /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. | ||
| 10 | | 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' | ||
| 11 | | 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 | ||
| 12 | | make[2]: *** Waiting for unfinished jobs.... | ||
| 13 | |||
| 14 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
| 15 | --- | ||
| 16 | spl/Makefile | 6 +++++- | ||
| 17 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/spl/Makefile b/spl/Makefile | ||
| 20 | index 6dbb105..3156d87 100644 | ||
| 21 | --- a/spl/Makefile | ||
| 22 | +++ b/spl/Makefile | ||
| 23 | @@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS))) | ||
| 24 | $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend | ||
| 25 | $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ | ||
| 26 | |||
| 27 | -depend: $(obj).depend | ||
| 28 | +# Explicitly make _depend in subdirs containing multiple targets to prevent | ||
| 29 | +# parallel sub-makes creating .depend files simultaneously. | ||
| 30 | +depend dep: $(obj).depend | ||
| 31 | + for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \ | ||
| 32 | + $(MAKE) -C $(SRCTREE)/$$dir _depend ; done | ||
| 33 | .PHONY: depend | ||
| 34 | |||
| 35 | # defines $(obj).depend target | ||
| 36 | -- | ||
| 37 | 1.8.2.1 | ||
| 38 | |||
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', | |||
| 11 | 11 | ||
| 12 | inherit deploy | 12 | inherit deploy |
| 13 | 13 | ||
| 14 | SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git" | 14 | SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \ |
| 15 | file://Fix-the-depend-race-issue.patch" | ||
| 15 | SRCREV = "5438fc1ca159c8f5724272efd1289e6d49771e69" | 16 | SRCREV = "5438fc1ca159c8f5724272efd1289e6d49771e69" |
| 16 | 17 | ||
| 17 | python () { | 18 | python () { |
