From 2570e8311fc246e529e5640e6d9937971f265394 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Tue, 15 Jul 2025 16:25:00 +0900 Subject: [PATCH] meta-zephyr-sdk: Remove qemu_legacy This commit removes the `qemu_legacy` recipe for building `qemu-system-sparc` because the main QEMU build is now able to emulate the Zephyr QEMU board. Signed-off-by: Stephanos Ioannidis --- .../recipes-devtools/qemu/qemu-zephyr_git.bb | 5 +- .../qemu_legacy/files/cross.patch | 22 -- .../qemu_legacy/qemu-legacy_git.bb | 228 ------------------ .../hosttools/hosttools-tarball.bb | 1 - 4 files changed, 1 insertion(+), 255 deletions(-) delete mode 100644 meta-zephyr-sdk/recipes-devtools/qemu_legacy/files/cross.patch delete mode 100644 meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_git.bb b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_git.bb index 4e2e8f55..d729ab16 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_git.bb +++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_git.bb @@ -92,7 +92,7 @@ EXTRA_OECONF = " \ --disable-af-xdp \ ${PACKAGECONFIG_CONFARGS} \ " -QEMU_TARGETS = "aarch64-softmmu arm-softmmu i386-softmmu or1k-softmmu mips-softmmu mipsel-softmmu xtensa-softmmu riscv32-softmmu riscv64-softmmu x86_64-softmmu rx-softmmu" +QEMU_TARGETS = "aarch64-softmmu arm-softmmu i386-softmmu or1k-softmmu mips-softmmu mipsel-softmmu riscv32-softmmu riscv64-softmmu rx-softmmu sparc-softmmu x86_64-softmmu xtensa-softmmu" EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}" EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}" @@ -157,9 +157,6 @@ do_install:append() { # Link ARC (Synopsys) QEMU executables ln -sf ../synopsys/bin/qemu-system-arc ${D}${bindir}/qemu-system-arc ln -sf ../synopsys/bin/qemu-system-arc64 ${D}${bindir}/qemu-system-arc64 - - # Link other legacy QEMU executables - ln -sf ../legacy/bin/qemu-system-sparc ${D}${bindir}/qemu-system-sparc } # Disable kvm/virgl/mesa on targets that do not support it diff --git a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/files/cross.patch b/meta-zephyr-sdk/recipes-devtools/qemu_legacy/files/cross.patch deleted file mode 100644 index a7735a53..00000000 --- a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/files/cross.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure b/configure -index 7c08c18358..0613279f91 100755 ---- a/configure -+++ b/configure -@@ -3118,7 +3118,6 @@ if test "$skip_meson" = no; then - fi - echo "strip = [$(meson_quote $strip)]" >> $cross - echo "windres = [$(meson_quote $windres)]" >> $cross -- if test "$cross_compile" = "yes"; then - cross_arg="--cross-file config-meson.cross" - echo "[host_machine]" >> $cross - echo "system = '$targetos'" >> $cross -@@ -3136,9 +3135,6 @@ if test "$skip_meson" = no; then - else - echo "endian = 'little'" >> $cross - fi -- else -- cross_arg="--native-file config-meson.cross" -- fi - mv $cross config-meson.cross - - rm -rf meson-private meson-info meson-logs diff --git a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb b/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb deleted file mode 100644 index 3d1f2b39..00000000 --- a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb +++ /dev/null @@ -1,228 +0,0 @@ - -DEPENDS = "glib-2.0 zlib pixman gnutls libtasn1 dtc ninja-native meson-native" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" - -SRCREV = "06740e68dcb2c2ae168875a730f233f5661eb8b6" -SRC_URI = "gitsm://github.com/zephyrproject-rtos/qemu.git;protocol=https;nobranch=1 \ - file://cross.patch \ -" - -BBCLASSEXTEND = "native nativesdk" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_PACKAGE_STRIP = "1" - -S = "${WORKDIR}/git" - -legacy_prefix = "${base_prefix}/usr/legacy" - -inherit autotools pkgconfig - -# Standard options: -# --prefix=PREFIX install in PREFIX [$prefix] -# --interp-prefix=PREFIX where to find shared libraries, etc. -# use %M for cpu name [$interp_prefix] -# --target-list=LIST set target list (default: build everything) -# $(echo Available targets: $default_target_list | \ -# fold -s -w 53 | sed -e 's/^/ /') -# -# Advanced options (experts only): -# --source-path=PATH path of source code [$source_path] -# --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix] -# --cc=CC use C compiler CC [$cc] -# --iasl=IASL use ACPI compiler IASL [$iasl] -# --host-cc=CC use C compiler CC [$host_cc] for code run at -# build time -# --cxx=CXX use C++ compiler CXX [$cxx] -# --objcc=OBJCC use Objective-C compiler OBJCC [$objcc] -# --extra-cflags=CFLAGS append extra C compiler flags QEMU_CFLAGS -# --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS -# --make=MAKE use specified make [$make] -# --install=INSTALL use specified install [$install] -# --python=PYTHON use specified python [$python] -# --smbd=SMBD use specified smbd [$smbd] -# --static enable static build [$static] -# --mandir=PATH install man pages in PATH -# --datadir=PATH install firmware in PATH$confsuffix -# --docdir=PATH install documentation in PATH$confsuffix -# --bindir=PATH install binaries in PATH -# --libdir=PATH install libraries in PATH -# --sysconfdir=PATH install config in PATH$confsuffix -# --localstatedir=PATH install local state in PATH (set at runtime on win32) -# --with-confsuffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir [$confsuffix] -# --enable-modules enable modules support -# --enable-debug-tcg enable TCG debugging -# --disable-debug-tcg disable TCG debugging (default) -# --enable-debug-info enable debugging information (default) -# --disable-debug-info disable debugging information -# --enable-debug enable common debug build options -# --enable-sparse enable sparse checker -# --disable-sparse disable sparse checker (default) -# --disable-strip disable stripping binaries -# --disable-werror disable compilation abort on warning -# --disable-stack-protector disable compiler-provided stack protection -# --disable-sdl disable SDL -# --enable-sdl enable SDL -# --with-sdlabi select preferred SDL ABI 1.2 or 2.0 -# --disable-gtk disable gtk UI -# --enable-gtk enable gtk UI -# --with-gtkabi select preferred GTK ABI 2.0 or 3.0 -# --disable-virtfs disable VirtFS -# --enable-virtfs enable VirtFS -# --disable-vnc disable VNC -# --enable-vnc enable VNC -# --disable-cocoa disable Cocoa (Mac OS X only) -# --enable-cocoa enable Cocoa (default on Mac OS X) -# --audio-drv-list=LIST set audio drivers list: -# Available drivers: $audio_possible_drivers -# --block-drv-whitelist=L Same as --block-drv-rw-whitelist=L -# --block-drv-rw-whitelist=L -# set block driver read-write whitelist -# (affects only QEMU, not qemu-img) -# --block-drv-ro-whitelist=L -# set block driver read-only whitelist -# (affects only QEMU, not qemu-img) -# --disable-xen disable xen backend driver support -# --enable-xen enable xen backend driver support -# --disable-xen-pci-passthrough -# --enable-xen-pci-passthrough -# --disable-brlapi disable BrlAPI -# --enable-brlapi enable BrlAPI -# --disable-vnc-tls disable TLS encryption for VNC server -# --enable-vnc-tls enable TLS encryption for VNC server -# --disable-vnc-sasl disable SASL encryption for VNC server -# --enable-vnc-sasl enable SASL encryption for VNC server -# --disable-vnc-jpeg disable JPEG lossy compression for VNC server -# --enable-vnc-jpeg enable JPEG lossy compression for VNC server -# --disable-vnc-png disable PNG compression for VNC server (default) -# --enable-vnc-png enable PNG compression for VNC server -# --disable-vnc-ws disable Websockets support for VNC server -# --enable-vnc-ws enable Websockets support for VNC server -# --disable-curses disable curses output -# --enable-curses enable curses output -# --disable-curl disable curl connectivity -# --enable-curl enable curl connectivity -# --disable-fdt disable fdt device tree -# --enable-fdt enable fdt device tree -# --disable-bluez disable bluez stack connectivity -# --enable-bluez enable bluez stack connectivity -# --disable-slirp disable SLIRP userspace network connectivity -# --disable-kvm disable KVM acceleration support -# --enable-kvm enable KVM acceleration support -# --disable-rdma disable RDMA-based migration support -# --enable-rdma enable RDMA-based migration support -# --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI) -# --enable-system enable all system emulation targets -# --disable-system disable all system emulation targets -# --enable-user enable supported user emulation targets -# --disable-user disable all user emulation targets -# --enable-linux-user enable all linux usermode emulation targets -# --disable-linux-user disable all linux usermode emulation targets -# --enable-bsd-user enable all BSD usermode emulation targets -# --disable-bsd-user disable all BSD usermode emulation targets -# --enable-guest-base enable GUEST_BASE support for usermode -# emulation targets -# --disable-guest-base disable GUEST_BASE support -# --enable-pie build Position Independent Executables -# --disable-pie do not build Position Independent Executables -# --fmod-lib path to FMOD library -# --fmod-inc path to FMOD includes -# --oss-lib path to OSS library -# --cpu=CPU Build for host CPU [$cpu] -# --enable-uuid enable uuid support -# --disable-vde disable support for vde network -# --enable-vde enable support for vde network -# --disable-netmap disable support for netmap network -# --enable-netmap enable support for netmap network -# --disable-linux-aio disable Linux AIO support -# --enable-linux-aio enable Linux AIO support -# --disable-cap-ng disable libcap-ng support -# --enable-cap-ng enable libcap-ng support -# --disable-attr disables attr and xattr support -# --enable-attr enable attr and xattr support -# --disable-blobs disable installing provided firmware blobs -# --enable-docs enable documentation build -# --disable-docs disable documentation build -# --disable-vhost-net disable vhost-net acceleration support -# --enable-vhost-net enable vhost-net acceleration support -# --enable-trace-backends=B Set trace backend -# Available backends: $($python $source_path/scripts/tracetool.py --list-backends) -# --with-trace-file=NAME Full PATH,NAME of file to store traces -# Default:trace- -# --disable-spice disable spice -# --enable-spice enable spice -# --enable-rbd enable building the rados block device (rbd) -# --disable-libiscsi disable iscsi support -# --enable-libiscsi enable iscsi support -# --disable-libnfs disable nfs support -# --enable-libnfs enable nfs support -# --disable-smartcard-nss disable smartcard nss support -# --enable-smartcard-nss enable smartcard nss support -# --disable-libusb disable libusb (for usb passthrough) -# --enable-libusb enable libusb (for usb passthrough) -# --disable-usb-redir disable usb network redirection support -# --enable-usb-redir enable usb network redirection support -# --enable-lzo enable the support of lzo compression library -# --enable-snappy enable the support of snappy compression library -# --disable-guest-agent disable building of the QEMU Guest Agent -# --enable-guest-agent enable building of the QEMU Guest Agent -# --with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent -# --with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb) -# --disable-seccomp disable seccomp support -# --enable-seccomp enables seccomp support -# --with-coroutine=BACKEND coroutine backend. Supported options: -# gthread, ucontext, sigaltstack, windows -# --disable-coroutine-pool disable coroutine freelist (worse performance) -# --enable-coroutine-pool enable coroutine freelist (better performance) -# --enable-glusterfs enable GlusterFS backend -# --disable-glusterfs disable GlusterFS backend -# --enable-gcov enable test coverage analysis with gcov -# --gcov=GCOV use specified gcov [$gcov_tool] -# --disable-tpm disable TPM support -# --enable-tpm enable TPM support -# --disable-libssh2 disable ssh block device support -# --enable-libssh2 enable ssh block device support -# --disable-vhdx disables support for the Microsoft VHDX image format -# --enable-vhdx enable support for the Microsoft VHDX image format -# --disable-quorum disable quorum block filter support -# --enable-quorum enable quorum block filter support -# --disable-numa disable libnuma support -# --enable-numa enable libnuma support - - -#--disable-blobs : BIOS needed for x86 -#--disable-fdt: Cannot use if supporting ARM -#--disable-kvm: AArch64 has a QEMU/KVM board - -QEMUS_BUILT = "sparc-softmmu" -QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \ - --disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio\ - --disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \ - --disable-tpm --disable-numa --disable-glusterfs \ - --disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \ - --disable-parallels --disable-replication \ - --disable-live-block-migration --disable-dmg --disable-werror \ - " - -do_configure() { - unset libdir - unset libexecdir - unset includedir - unset bindir - unset mandir - unset datadir - unset docdir - unset sysconfdir - unset local_statedir - unset firmwarepath - unset localedir - ${S}/configure ${QEMU_FLAGS} --target-list="${QEMUS_BUILT}" --prefix=${legacy_prefix} \ - --meson=meson -} - -FILES:${PN} = " \ - ${legacy_prefix} \ - " - -INSANE_SKIP:${PN} = "already-stripped" diff --git a/meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb b/meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb index 50696643..606d78ff 100644 --- a/meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb +++ b/meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb @@ -10,7 +10,6 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-openocd \ nativesdk-dtc \ nativesdk-qemu-arc \ - nativesdk-qemu-legacy \ nativesdk-qemu-xilinx \ nativesdk-qemu-zephyr \ "