Skip to content

Commit fce61c3

Browse files
michalsimeknashif
authored andcommitted
meta-zephyr-sdk: xilinx_qemu: Update to 8.2.7 QEMU
Update to 8.2.7 QEMU which is aligned with Xilinx v2025.1 tools. The main reason for this update is that this version is supporting Versal Gen 2 and associated models. Signed-off-by: Michal Simek <michal.simek@amd.com>
1 parent 22aaad0 commit fce61c3

File tree

4 files changed

+58
-37
lines changed

4 files changed

+58
-37
lines changed

meta-zephyr-sdk/recipes-devtools/qemu_xilinx/files/cross.patch

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,26 @@ Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
1111
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1212

1313
---
14-
configure | 4 ----
15-
1 file changed, 4 deletions(-)
14+
configure | 2 --
15+
1 file changed, 2 deletions(-)
1616

17-
Index: qemu-8.0.0/configure
18-
===================================================================
19-
--- qemu-8.0.0.orig/configure
20-
+++ qemu-8.0.0/configure
21-
@@ -2590,7 +2590,6 @@ if test "$skip_meson" = no; then
17+
diff --git a/configure b/configure
18+
index c1e03801f14d..bd81dcb98df8 100755
19+
--- a/configure
20+
+++ b/configure
21+
@@ -1795,7 +1795,6 @@ if test "$skip_meson" = no; then
2222
echo "widl = [$(meson_quote $widl)]" >> $cross
2323
echo "windres = [$(meson_quote $windres)]" >> $cross
2424
echo "windmc = [$(meson_quote $windmc)]" >> $cross
2525
- if test "$cross_compile" = "yes"; then
26-
cross_arg="--cross-file config-meson.cross"
2726
echo "[host_machine]" >> $cross
2827
echo "system = '$targetos'" >> $cross
29-
@@ -2608,9 +2607,6 @@ if test "$skip_meson" = no; then
30-
else
31-
echo "endian = 'little'" >> $cross
32-
fi
33-
- else
34-
- cross_arg="--native-file config-meson.cross"
28+
case "$cpu" in
29+
@@ -1820,7 +1819,6 @@ if test "$skip_meson" = no; then
30+
mv $native config-meson.native
31+
meson_option_add --native-file
32+
meson_option_add config-meson.native
3533
- fi
3634
mv $cross config-meson.cross
37-
38-
rm -rf meson-private meson-info meson-logs
35+
meson_add_machine_file config-meson.cross
36+
if test -f "$source_path/configs/meson/$targetos.txt"; then
Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,32 @@
1-
Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
1+
From 72002fcd5673d0144d3fe756521348e9381061e1 Mon Sep 17 00:00:00 2001
2+
Message-ID: <72002fcd5673d0144d3fe756521348e9381061e1.1747667452.git.michal.simek@amd.com>
3+
From: Michal Simek <michal.simek@amd.com>
4+
Date: Mon, 19 May 2025 17:10:43 +0200
5+
Subject: [PATCH] Upstream-Status: Inappropriate [workaround, would need a real
6+
fix for upstream]
27

3-
Index: qemu-8.1.0/configure
4-
===================================================================
5-
--- qemu-8.1.0.orig/configure
6-
+++ qemu-8.1.0/configure
7-
@@ -1032,12 +1032,7 @@ then
8-
exit 1
9-
fi
8+
---
9+
configure | 7 +------
10+
1 file changed, 1 insertion(+), 6 deletions(-)
1011

12+
diff --git a/configure b/configure
13+
index bd81dcb98df8..d462e56417f2 100755
14+
--- a/configure
15+
+++ b/configure
16+
@@ -964,12 +964,7 @@ fi
17+
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
18+
${source_path}/pythondeps.toml meson || exit 1
19+
1120
-# At this point, we expect Meson to be installed and available.
1221
-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
1322
-# We ignore PATH completely here: we want to use the venv's Meson
1423
-# *exclusively*.
1524
-
1625
-meson="$(cd pyvenv/bin; pwd)/meson"
1726
+meson=`which meson`
18-
27+
1928
# Conditionally ensure Sphinx is installed.
29+
30+
--
31+
2.43.0
32+

meta-zephyr-sdk/recipes-devtools/qemu_xilinx/files/no-pip.patch

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
qemu: Ensure pip and the python venv aren't used for meson
1+
From 757ff30fe336a1304355eefa3fc93e0b8cc86986 Mon Sep 17 00:00:00 2001
2+
Message-ID: <757ff30fe336a1304355eefa3fc93e0b8cc86986.1747667700.git.michal.simek@amd.com>
3+
From: Richard Purdie <richard.purdie@linuxfoundation.org>
4+
Date: Mon, 19 May 2025 17:14:55 +0200
5+
Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
26

37
Qemu wants to use a supported python version and a specific meson version
48
to "help" users and uses pip and creates a venv to do this. This is a nightmare
@@ -21,25 +25,31 @@ as it stands is a workaround.
2125

2226
Upstream-Status: Inappropriate [oe specific]
2327
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
24-
25-
Index: qemu-8.1.2/configure
26-
===================================================================
27-
--- qemu-8.1.2.orig/configure
28-
+++ qemu-8.1.2/configure
29-
@@ -1009,7 +1009,7 @@ python="$(command -v "$python")"
28+
---
29+
configure | 3 ++-
30+
1 file changed, 2 insertions(+), 1 deletion(-)
31+
32+
diff --git a/configure b/configure
33+
index d462e56417f2..3aa817827525 100755
34+
--- a/configure
35+
+++ b/configure
36+
@@ -946,7 +946,7 @@ python="$(command -v "$python")"
3037
echo "python determined to be '$python'"
3138
echo "python version: $($python --version)"
32-
39+
3340
-python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)"
3441
+python=python3
3542
if test "$?" -ne 0 ; then
3643
error_exit "python venv creation failed"
3744
fi
38-
@@ -1017,6 +1017,7 @@ fi
45+
@@ -954,6 +954,7 @@ fi
3946
# Suppress writing compiled files
4047
python="$python -B"
4148
mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
4249
+mkvenv=true
50+
51+
# Finish preparing the virtual environment using vendored .whl files
52+
53+
--
54+
2.43.0
4355

44-
mkvenv_flags=""
45-
if test "$download" = "enabled" ; then

meta-zephyr-sdk/recipes-devtools/qemu_xilinx/qemu-xilinx_git.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RDEPENDS:${PN}-common:class-target += "bash"
66
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
77
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
88

9-
SRCREV_qemu = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
9+
SRCREV_qemu = "b05c9752662eb4b8120a57454a323445d78d1463"
1010
SRCREV_FORMAT = "qemu"
1111

1212
SRC_URI += "gitsm://github.com/Xilinx/qemu.git;protocol=https;nobranch=1;name=qemu \

0 commit comments

Comments
 (0)