From ac425c57adfae9a4dba2bede765327fd86a10b7f Mon Sep 17 00:00:00 2001 From: jakllsch Date: Sun, 13 Oct 2024 18:02:44 +0000 Subject: [PATCH] qemu: fix build issues due to PLIST on Linux --- emulators/qemu/Makefile | 6 +++--- emulators/qemu/PLIST | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index faaab2ff1137..94012db0edaa 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.349 2024/09/05 07:40:08 adam Exp $ +# $NetBSD: Makefile,v 1.350 2024/10/13 18:02:44 jakllsch Exp $ DISTNAME= qemu-9.1.0 CATEGORIES= emulators @@ -118,7 +118,6 @@ UE_ARCHS+= i386 UE_ARCHS+= loongarch64 UE_ARCHS+= m68k microblaze microblazeel UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el -UE_ARCHS+= nios2 UE_ARCHS+= or1k ppc ppc64 ppc64le UE_ARCHS+= riscv32 riscv64 UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64 @@ -155,6 +154,7 @@ PLIST.bridge-helper= yes PLIST.ga= yes PLIST.nbd= yes PLIST.pr-helper= yes +PLIST.vmsr-helper= yes .elif ${MACHINE_PLATFORM:MSunOS-5.11-*} PLIST.ga= yes PLIST.nbd= yes @@ -169,7 +169,7 @@ CONFIGURE_ARGS+= --enable-plugins CONFIGURE_ARGS+= --disable-plugins .endif -PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper +PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper vmsr-helper .for pvar in ${USER_EMUL} PLIST.${pvar}= yes .endfor diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST index 16a28490d907..df4b7ec1bc5f 100644 --- a/emulators/qemu/PLIST +++ b/emulators/qemu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.90 2024/09/05 07:40:08 adam Exp $ +@comment $NetBSD: PLIST,v 1.91 2024/10/13 18:02:44 jakllsch Exp $ bin/elf2dmp ${PLIST.aarch64}bin/qemu-aarch64 ${PLIST.aarch64_be}bin/qemu-aarch64_be @@ -25,7 +25,6 @@ ${PLIST.mipsel}bin/qemu-mipsel ${PLIST.mipsn32}bin/qemu-mipsn32 ${PLIST.mipsn32el}bin/qemu-mipsn32el ${PLIST.nbd}bin/qemu-nbd -${PLIST.nios2}bin/qemu-nios2 ${PLIST.or1k}bin/qemu-or1k ${PLIST.ppc}bin/qemu-ppc ${PLIST.ppc64}bin/qemu-ppc64 @@ -76,6 +75,7 @@ ${PLIST.xtensaeb}bin/qemu-xtensaeb ${PLIST.plugins}include/qemu-plugin.h ${PLIST.bridge-helper}libexec/qemu-bridge-helper ${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper +${PLIST.vmsr-helper}bin/qemu-vmsr-helper man/man1/qemu-img.1 man/man1/qemu-storage-daemon.1 man/man1/qemu.1