]> code.ossystems Code Review - meta-freescale.git/commitdiff
add kernel patch to fix parallel build failures
authorMatthew McClintock <msm@freescale.com>
Thu, 6 Sep 2012 18:50:41 +0000 (13:50 -0500)
committerMatthew McClintock <msm@freescale.com>
Fri, 7 Sep 2012 02:58:30 +0000 (21:58 -0500)
Signed-off-by: Matthew McClintock <msm@freescale.com>
meta-fsl-ppc/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch [new file with mode: 0644]
meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc

diff --git a/meta-fsl-ppc/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/meta-fsl-ppc/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch
new file mode 100644 (file)
index 0000000..d3464fb
--- /dev/null
@@ -0,0 +1,44 @@
+Upstream-Status: Pending
+
+From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001
+From: Matthew McClintock <msm@freescale.com>
+Date: Thu, 6 Sep 2012 13:45:21 -0500
+Subject: powerpc: Fix build dependencies for c files requiring libfdt.h
+
+Several files in obj-plat depend on libfdt header file. Sometimes
+when building one can see the following issue. This patch adds
+libfdt as dependency to those object files
+
+| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
+| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment
+| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0:
+| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef
+|   BOOTCC  arch/powerpc/boot/inffast.o
+| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1
+| make[1]: *** Waiting for unfinished jobs....
+|   BOOTCC  arch/powerpc/boot/inflate.o
+| make: *** [uImage] Error 2
+| ERROR: oe_runmake failed
+| ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information)
+NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed
+
+Signed-off-by: Matthew McClintock <msm@freescale.com>
+---
+ arch/powerpc/boot/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
+index b7d8333..6a15c96 100644
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
+ obj-boot := $(addsuffix .o, $(basename $(src-boot)))
+ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
+ obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
++obj-plat: $(libfdt)
+ quiet_cmd_copy_zlib = COPY    $@
+       cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
+-- 
+1.7.9.7
+
index 708ae579177e53713dbe124f30bb4b8595a9d28b..563e916e9d3e255b29cc33dacf2600bf4ef15a3a 100644 (file)
@@ -1,11 +1,12 @@
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 PV = "3.0.34"
-PR = "r5"
+PR = "r6"
 
 SRCREV = "fsl-sdk-v1.2.1"
 SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \
            file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \
+          file://0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch \
          "
 
 KSRC ?= ""