diff options
author | Olaf Hering <olh@suse.de> | 2005-07-13 04:11:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 14:25:25 -0400 |
commit | f13487c66c75f5db004a0631047309d9e7c5aab7 (patch) | |
tree | 19585562d0ffb0923ed6c2d829d44f10eb619482 | |
parent | 7ee91ec14bd4def036b4084da29869382078e44b (diff) |
[PATCH] ppc32: make -j12 all fails in uImage target
make -j zImage may call if_changed twice at the same time, the result is a
corrupted vmlinux.gz
Write to a temporary file for the time being until someone with make skills
fix the serialization properly.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/ppc/boot/images/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ppc/boot/images/Makefile b/arch/ppc/boot/images/Makefile index c9ac5f5fa9e4..532e7ef1edb6 100644 --- a/arch/ppc/boot/images/Makefile +++ b/arch/ppc/boot/images/Makefile | |||
@@ -6,12 +6,17 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh | |||
6 | 6 | ||
7 | extra-y := vmlinux.bin vmlinux.gz | 7 | extra-y := vmlinux.bin vmlinux.gz |
8 | 8 | ||
9 | # two make processes may write to vmlinux.gz at the same time with make -j | ||
10 | quiet_cmd_mygzip = GZIP $@ | ||
11 | cmd_mygzip = gzip -f -9 < $< > $@.$$$$ && mv $@.$$$$ $@ | ||
12 | |||
13 | |||
9 | OBJCOPYFLAGS_vmlinux.bin := -O binary | 14 | OBJCOPYFLAGS_vmlinux.bin := -O binary |
10 | $(obj)/vmlinux.bin: vmlinux FORCE | 15 | $(obj)/vmlinux.bin: vmlinux FORCE |
11 | $(call if_changed,objcopy) | 16 | $(call if_changed,objcopy) |
12 | 17 | ||
13 | $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE | 18 | $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE |
14 | $(call if_changed,gzip) | 19 | $(call if_changed,mygzip) |
15 | 20 | ||
16 | quiet_cmd_uimage = UIMAGE $@ | 21 | quiet_cmd_uimage = UIMAGE $@ |
17 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \ | 22 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \ |