diff options
author | Matthew McClintock <msm@freescale.com> | 2012-09-06 13:50:41 -0500 |
---|---|---|
committer | Matthew McClintock <msm@freescale.com> | 2012-09-06 21:58:30 -0500 |
commit | c1c5799fa835a3f93b4c9a0abeb14bd8f7defc87 (patch) | |
tree | a3107ecabb988f61771d4f25bf0be817f07f6afd | |
parent | 46f86c3fe041f83457f33d8c4c401101e6209880 (diff) | |
download | meta-fsl-ppc-c1c5799fa835a3f93b4c9a0abeb14bd8f7defc87.tar.gz |
add kernel patch to fix parallel build failures
Signed-off-by: Matthew McClintock <msm@freescale.com>
-rw-r--r-- | recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch | 44 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq-sdk.inc | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file mode 100644 index 0000000..d3464fb --- /dev/null +++ b/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001 | ||
4 | From: Matthew McClintock <msm@freescale.com> | ||
5 | Date: Thu, 6 Sep 2012 13:45:21 -0500 | ||
6 | Subject: powerpc: Fix build dependencies for c files requiring libfdt.h | ||
7 | |||
8 | Several files in obj-plat depend on libfdt header file. Sometimes | ||
9 | when building one can see the following issue. This patch adds | ||
10 | libfdt as dependency to those object files | ||
11 | |||
12 | | In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: | ||
13 | | arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment | ||
14 | | In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: | ||
15 | | arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef | ||
16 | | BOOTCC arch/powerpc/boot/inffast.o | ||
17 | | make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1 | ||
18 | | make[1]: *** Waiting for unfinished jobs.... | ||
19 | | BOOTCC arch/powerpc/boot/inflate.o | ||
20 | | make: *** [uImage] Error 2 | ||
21 | | ERROR: oe_runmake failed | ||
22 | | 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) | ||
23 | NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed | ||
24 | |||
25 | Signed-off-by: Matthew McClintock <msm@freescale.com> | ||
26 | --- | ||
27 | arch/powerpc/boot/Makefile | 1 + | ||
28 | 1 file changed, 1 insertion(+) | ||
29 | |||
30 | diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile | ||
31 | index b7d8333..6a15c96 100644 | ||
32 | --- a/arch/powerpc/boot/Makefile | ||
33 | +++ b/arch/powerpc/boot/Makefile | ||
34 | @@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot)) | ||
35 | obj-boot := $(addsuffix .o, $(basename $(src-boot))) | ||
36 | obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib)))) | ||
37 | obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) | ||
38 | +obj-plat: $(libfdt) | ||
39 | |||
40 | quiet_cmd_copy_zlib = COPY $@ | ||
41 | cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@ | ||
42 | -- | ||
43 | 1.7.9.7 | ||
44 | |||
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc index 708ae57..563e916 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk.inc +++ b/recipes-kernel/linux/linux-qoriq-sdk.inc | |||
@@ -1,11 +1,12 @@ | |||
1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
2 | 2 | ||
3 | PV = "3.0.34" | 3 | PV = "3.0.34" |
4 | PR = "r5" | 4 | PR = "r6" |
5 | 5 | ||
6 | SRCREV = "fsl-sdk-v1.2.1" | 6 | SRCREV = "fsl-sdk-v1.2.1" |
7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ | 7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ |
8 | file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ | 8 | file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ |
9 | file://0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | KSRC ?= "" | 12 | KSRC ?= "" |