diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 23:00:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-09 09:09:49 +0000 |
| commit | 0d298198e57753213391788a8a9204d99648636b (patch) | |
| tree | 043c08668b5e30472f230bf41b7837382d3636ac /meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch | |
| parent | 10c69538c0cb8708c7eff9e8dc05ca7c669cb61c (diff) | |
| download | poky-0d298198e57753213391788a8a9204d99648636b.tar.gz | |
qemu: Upgrade 5.1.0->5.2.0
This involves some pretty major changes for qemu. In particular, they
switched to meson+ninja so we have to adapt to that.
Patch changes:
* CVE patches - dropped as backports
* cflags fix - upstream code changed significantly, need new patch if still issues
* mips TLB entries - dropped as merged upstream
* usb fix - dropped as merged upstream
* find_datadir - dropped as code no longer present that I could find
A patch was added to allow us to force the configure script into "cross" mode
without setting cross_prefix which has other effects we don't need/want.
Dependencies on meson/ninja were added.
Specifying the python interpreter causes the internal meson copy to be
built/used which is undesireable for us so don't do that. The correct
python is in PATH anyway.
Acked-by: Alistair Francis <alistair.francis@wdc.com>
(From OE-Core rev: 181c635567aafb9b4787d8d6d0bcd4a615ceae80)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch index d6c0f9ebe9..3fe9aa6eb5 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Do-not-include-file-if-not-exists.patch | |||
| @@ -15,10 +15,10 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | |||
| 15 | linux-user/syscall.c | 2 ++ | 15 | linux-user/syscall.c | 2 ++ |
| 16 | 1 file changed, 2 insertions(+) | 16 | 1 file changed, 2 insertions(+) |
| 17 | 17 | ||
| 18 | Index: qemu-5.1.0/linux-user/syscall.c | 18 | Index: qemu-5.2.0/linux-user/syscall.c |
| 19 | =================================================================== | 19 | =================================================================== |
| 20 | --- qemu-5.1.0.orig/linux-user/syscall.c | 20 | --- qemu-5.2.0.orig/linux-user/syscall.c |
| 21 | +++ qemu-5.1.0/linux-user/syscall.c | 21 | +++ qemu-5.2.0/linux-user/syscall.c |
| 22 | @@ -109,7 +109,9 @@ | 22 | @@ -109,7 +109,9 @@ |
| 23 | #include <linux/blkpg.h> | 23 | #include <linux/blkpg.h> |
| 24 | #include <netpacket/packet.h> | 24 | #include <netpacket/packet.h> |
| @@ -28,4 +28,4 @@ Index: qemu-5.1.0/linux-user/syscall.c | |||
| 28 | +#endif | 28 | +#endif |
| 29 | #include <linux/rtc.h> | 29 | #include <linux/rtc.h> |
| 30 | #include <sound/asound.h> | 30 | #include <sound/asound.h> |
| 31 | #ifdef HAVE_DRM_H | 31 | #ifdef CONFIG_BTRFS |