diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-03-16 17:40:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-25 16:38:12 +0000 |
commit | 7c62b36a34f3b1491bf3df6a559bc0a74c74c173 (patch) | |
tree | 486fc3da0426a673b3778495bbe59a6441f007aa /meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch | |
parent | fcb1b5a4d76f18d5cc1a0327ce41f6c188da6618 (diff) | |
download | poky-7c62b36a34f3b1491bf3df6a559bc0a74c74c173.tar.gz |
qemu: Upgrade 0.13.0 -> 0.14.0
* ppc-hack patch is dropped.
* Other patches which were direct backports
or has been merged upstream in 0.14.0 are
also dropped
(From OE-Core rev: 97fbdfdbfb15de325fd148bcecc9187d0f778db5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch deleted file mode 100644 index 278b1a759d..0000000000 --- a/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Make -j(>=6) always fail as some job depends on config-host.h. Added following | ||
2 | patch in upstream to resolve it. | ||
3 | |||
4 | Could remove it in next upgrade if necessary. | ||
5 | |||
6 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
7 | |||
8 | commit f0acb38015409024683911380daa94cc974e4e0e | ||
9 | Author: Paul Brook <paul@codesourcery.com> | ||
10 | Date: Fri Nov 26 18:46:03 2010 +0000 | ||
11 | |||
12 | Add missing dependency. | ||
13 | |||
14 | Teach Makefile that cmd.o depends on a generated header (specifically | ||
15 | config-host.h). | ||
16 | |||
17 | Signed-off-by: Paul Brook <paul@codesourcery.com> | ||
18 | (cherry picked from commit 6e14404aab26f74a448747d1e793ac16bde8a92b) | ||
19 | |||
20 | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> | ||
21 | |||
22 | Index: qemu-0.13.0/Makefile | ||
23 | =================================================================== | ||
24 | --- qemu-0.13.0.orig/Makefile 2011-01-18 09:45:45.000000000 +0800 | ||
25 | +++ qemu-0.13.0/Makefile 2011-01-18 09:45:45.000000000 +0800 | ||
26 | @@ -107,7 +107,7 @@ | ||
27 | ###################################################################### | ||
28 | |||
29 | qemu-img.o: qemu-img-cmds.h | ||
30 | -qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) | ||
31 | +qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS) | ||
32 | |||
33 | qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) | ||
34 | |||