Skip to content

Commit 666f881

Browse files
committed
qemu: rename xilinx qemu and update to work with poky 5
Rename and modify to work with latest poky. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent f9465a7 commit 666f881

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

meta-zephyr-sdk/recipes-devtools/xilinx_qemu/xilinx-qemu_git.bb renamed to meta-zephyr-sdk/recipes-devtools/qemu_xilinx/qemu-xilinx_git.bb

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

22
DEPENDS = "glib-2.0 zlib pixman gnutls dtc"
33
LICENSE = "GPLv2"
4-
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
54
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
65
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
76

87
SRCREV = "e40b634b24b37fe521bb2857c5e93ee1d30c2e37"
9-
SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https \
8+
SRC_URI = "gitsm://github.com/Xilinx/qemu.git;protocol=https;nobranch=1 \
109
file://0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch \
1110
file://0002-Enable-WFI-CPU-halting-in-icount-mode.patch \
1211
"
@@ -201,7 +200,7 @@ QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-
201200
--disable-tpm --disable-numa --disable-glusterfs --disable-blobs \
202201
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
203202
--disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
204-
--disable-live-block-migration --disable-dmg \
203+
--disable-live-block-migration --disable-dmg --disable-werror \
205204
"
206205

207206
# NOTE: Once --prefix is set, QEMU configure script automatically figures out adequate sysconfdir,
@@ -211,11 +210,22 @@ QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-
211210
# /usr.
212211

213212
do_configure() {
213+
unset libdir
214+
unset libexecdir
215+
unset includedir
216+
unset bindir
217+
unset mandir
218+
unset datadir
219+
unset docdir
220+
unset sysconfdir
221+
unset local_statedir
222+
unset firmwarepath
223+
unset localedir
214224
${S}/configure ${QEMU_FLAGS} --target-list="${QEMUS_BUILT}" --prefix=${xilinx_qemu_prefix}
215225
}
216226

217-
FILES_${PN} = " \
218-
/opt/zephyr-sdk \
227+
FILES:${PN} = " \
228+
${xilinx_qemu_prefix} \
219229
"
220230

221231
INSANE_SKIP_${PN} = "already-stripped"

meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ TOOLCHAIN_HOST_TASK ?= "\
1111
nativesdk-dtc \
1212
nativesdk-qemu-arc \
1313
nativesdk-qemu-legacy \
14+
nativesdk-qemu-xilinx \
1415
nativesdk-qemu-zephyr \
1516
"
1617

0 commit comments

Comments
 (0)