summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/cross.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-09-08 20:01:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-11 18:41:37 +0100
commitd87987fc1a4e7f31fb5740568e5edb9a8d123992 (patch)
tree0d31c92214a6db2b070e18c4592040a00ce7386d /meta/recipes-devtools/qemu/qemu/cross.patch
parent4a4d5f78a6962dda5f63e9891825c80a8a87bf66 (diff)
downloadpoky-d87987fc1a4e7f31fb5740568e5edb9a8d123992.tar.gz
qemu: update 6.0.0 -> 6.1.0
Recipe changes: qemu-plugin.h is installed by both qemu-native and qemu-system-native qmp.py module is now provided in a module directory (no other files from that directory are necessary to use it though) additional host-specific info is stripeed from ptest tests/tcg/*.mak Patches: drop all backports drop 0001-Add-enable-disable-udev.patch (change added upstream) drop 0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch (issue fixed upstream) drop 0004-qemu-disable-Valgrind.patch (valgrind detection moved from configure to meson, and should be robust against host contamination) rebase 0010-configure-Add-pkg-config-handling-for-libgcrypt.patch (upstream moved libgcrypt handling from configure to meson, and using pkg-config is now a one-liner adjustment) rebase cross.patch (From OE-Core rev: b2710d25e3d8d79a35dbd4332ffc5cc8053d5eb8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/cross.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/cross.patch40
1 files changed, 25 insertions, 15 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/cross.patch b/meta/recipes-devtools/qemu/qemu/cross.patch
index a0fc39e5e2..bdb77ec7d0 100644
--- a/meta/recipes-devtools/qemu/qemu/cross.patch
+++ b/meta/recipes-devtools/qemu/qemu/cross.patch
@@ -1,30 +1,40 @@
1From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 5 Jan 2021 23:00:14 +0000
4Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0
5
1We need to be able to trigger configure's cross code but we don't want 6We need to be able to trigger configure's cross code but we don't want
2to set cross_prefix as it does other things we don't want. Patch things 7to set cross_prefix as it does other things we don't want. Patch things
3so we can do what we need in the target config case. 8so we can do what we need in the target config case.
4 9
5Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] 10Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12---
13 configure | 4 ----
14 1 file changed, 4 deletions(-)
7 15
8 16diff --git a/configure b/configure
9Index: qemu-6.0.0/configure 17index 9a79a004d..563b7827f 100755
10=================================================================== 18--- a/configure
11--- qemu-6.0.0.orig/configure 19+++ b/configure
12+++ qemu-6.0.0/configure 20@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then
13@@ -6371,7 +6371,6 @@ if has $sdl2_config; then 21 fi
14 fi 22 echo "strip = [$(meson_quote $strip)]" >> $cross
15 echo "strip = [$(meson_quote $strip)]" >> $cross 23 echo "windres = [$(meson_quote $windres)]" >> $cross
16 echo "windres = [$(meson_quote $windres)]" >> $cross 24- if test "$cross_compile" = "yes"; then
17-if test "$cross_compile" = "yes"; then
18 cross_arg="--cross-file config-meson.cross" 25 cross_arg="--cross-file config-meson.cross"
19 echo "[host_machine]" >> $cross 26 echo "[host_machine]" >> $cross
20 if test "$mingw32" = "yes" ; then 27 if test "$mingw32" = "yes" ; then
21@@ -6403,9 +6402,6 @@ if test "$cross_compile" = "yes"; then 28@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then
22 else 29 else
23 echo "endian = 'little'" >> $cross 30 echo "endian = 'little'" >> $cross
24 fi 31 fi
25-else 32- else
26- cross_arg="--native-file config-meson.cross" 33- cross_arg="--native-file config-meson.cross"
27-fi 34- fi
28 mv $cross config-meson.cross 35 mv $cross config-meson.cross
29 36
30 rm -rf meson-private meson-info meson-logs 37 rm -rf meson-private meson-info meson-logs
38--
392.17.1
40