Skip to content

Commit 9021ce2

Browse files
committed
arc qemu: update for latest poky
make old recipes work with latest poky. Signed-off-by: Anas Nashif <[email protected]>
1 parent 365620c commit 9021ce2

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

meta-zephyr-sdk/recipes-devtools/arc_qemu/arc-qemu_git.bb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
DEPENDS = "glib-2.0 zlib pixman gnutls libtasn1 dtc ninja-native meson-native"
33
LICENSE = "GPLv2"
4-
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4+
#FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
66
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
77

88
SRCREV = "b46c4ec2d07a4c56c426b3d48195d6f2902226e5"
9-
SRC_URI = "git://github.com/foss-for-synopsys-dwc-arc-processors/qemu.git;protocol=https;nobranch=1 \
9+
SRC_URI = "gitsm://github.com/foss-for-synopsys-dwc-arc-processors/qemu.git;protocol=https;nobranch=1 \
1010
file://cross.patch \
1111
"
1212

@@ -199,7 +199,7 @@ QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-
199199
--disable-tpm --disable-numa --disable-glusterfs \
200200
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
201201
--disable-kvm --disable-parallels --disable-replication \
202-
--disable-live-block-migration --disable-dmg --disable-fdt --disable-blobs \
202+
--disable-live-block-migration --disable-dmg --disable-fdt --disable-blobs --disable-werror \
203203
"
204204

205205
# NOTE: Once --prefix is set, QEMU configure script automatically figures out adequate sysconfdir,
@@ -223,12 +223,14 @@ do_configure() {
223223
unset firmwarepath
224224
unset localedir
225225

226-
${S}/configure ${QEMU_FLAGS} --target-list="${QEMUS_BUILT}" --prefix=${arc_qemu_prefix} \
226+
${S}/configure ${QEMU_FLAGS} --target-list="${QEMUS_BUILT}" --prefix=${arc_qemu_prefix} \
227227
--meson=meson
228228
}
229229

230-
FILES_${PN} = " \
231-
/opt/zephyr-sdk \
230+
231+
FILES:${PN} = " \
232+
${arc_qemu_prefix} \
232233
"
233234

235+
234236
INSANE_SKIP_${PN} = "already-stripped"
Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
1-
We need to be able to trigger configure's cross code but we don't want
2-
to set cross_prefix as it does other things we don't want. Patch things
3-
so we can do what we need in the target config case.
1+
From 0f45ccc448ff392e9844ea7f66bb697f334eefa7 Mon Sep 17 00:00:00 2001
2+
From: Anas Nashif <[email protected]>
3+
Date: Sun, 16 Feb 2025 07:44:37 -0500
4+
Subject: [PATCH] cross patch
45

5-
Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
6-
Signed-off-by: Richard Purdie <[email protected]>
6+
Signed-off-by: Anas Nashif <[email protected]>
7+
---
8+
configure | 4 ----
9+
1 file changed, 4 deletions(-)
710

8-
9-
Index: qemu/configure
10-
===================================================================
11+
diff --git a/configure b/configure
12+
index 529d28fa5a..7ecbe94dc0 100755
1113
--- a/configure
1214
+++ b/configure
13-
@@ -3934,7 +3934,6 @@ if test "$skip_meson" = no; then
15+
@@ -3122,7 +3122,6 @@ if test "$skip_meson" = no; then
1416
fi
1517
echo "strip = [$(meson_quote $strip)]" >> $cross
1618
echo "windres = [$(meson_quote $windres)]" >> $cross
1719
- if test "$cross_compile" = "yes"; then
1820
cross_arg="--cross-file config-meson.cross"
1921
echo "[host_machine]" >> $cross
20-
if test "$mingw32" = "yes" ; then
21-
@@ -3966,9 +3965,6 @@ if test "$skip_meson" = no; then
22+
echo "system = '$targetos'" >> $cross
23+
@@ -3140,9 +3139,6 @@ if test "$skip_meson" = no; then
2224
else
2325
echo "endian = 'little'" >> $cross
2426
fi
2527
- else
2628
- cross_arg="--native-file config-meson.cross"
2729
- fi
2830
mv $cross config-meson.cross
29-
31+
3032
rm -rf meson-private meson-info meson-logs
33+
--
34+
2.43.0
35+

0 commit comments

Comments
 (0)