Skip to content

Commit ac425c5

Browse files
committed
qemu: fix build issues due to PLIST on Linux
1 parent 29efc38 commit ac425c5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

emulators/qemu/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.349 2024/09/05 07:40:08 adam Exp $
1+
# $NetBSD: Makefile,v 1.350 2024/10/13 18:02:44 jakllsch Exp $
22

33
DISTNAME= qemu-9.1.0
44
CATEGORIES= emulators
@@ -118,7 +118,6 @@ UE_ARCHS+= i386
118118
UE_ARCHS+= loongarch64
119119
UE_ARCHS+= m68k microblaze microblazeel
120120
UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el
121-
UE_ARCHS+= nios2
122121
UE_ARCHS+= or1k ppc ppc64 ppc64le
123122
UE_ARCHS+= riscv32 riscv64
124123
UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64
@@ -155,6 +154,7 @@ PLIST.bridge-helper= yes
155154
PLIST.ga= yes
156155
PLIST.nbd= yes
157156
PLIST.pr-helper= yes
157+
PLIST.vmsr-helper= yes
158158
.elif ${MACHINE_PLATFORM:MSunOS-5.11-*}
159159
PLIST.ga= yes
160160
PLIST.nbd= yes
@@ -169,7 +169,7 @@ CONFIGURE_ARGS+= --enable-plugins
169169
CONFIGURE_ARGS+= --disable-plugins
170170
.endif
171171

172-
PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper
172+
PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper vmsr-helper
173173
.for pvar in ${USER_EMUL}
174174
PLIST.${pvar}= yes
175175
.endfor

emulators/qemu/PLIST

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.90 2024/09/05 07:40:08 adam Exp $
1+
@comment $NetBSD: PLIST,v 1.91 2024/10/13 18:02:44 jakllsch Exp $
22
bin/elf2dmp
33
${PLIST.aarch64}bin/qemu-aarch64
44
${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -25,7 +25,6 @@ ${PLIST.mipsel}bin/qemu-mipsel
2525
${PLIST.mipsn32}bin/qemu-mipsn32
2626
${PLIST.mipsn32el}bin/qemu-mipsn32el
2727
${PLIST.nbd}bin/qemu-nbd
28-
${PLIST.nios2}bin/qemu-nios2
2928
${PLIST.or1k}bin/qemu-or1k
3029
${PLIST.ppc}bin/qemu-ppc
3130
${PLIST.ppc64}bin/qemu-ppc64
@@ -76,6 +75,7 @@ ${PLIST.xtensaeb}bin/qemu-xtensaeb
7675
${PLIST.plugins}include/qemu-plugin.h
7776
${PLIST.bridge-helper}libexec/qemu-bridge-helper
7877
${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper
78+
${PLIST.vmsr-helper}bin/qemu-vmsr-helper
7979
man/man1/qemu-img.1
8080
man/man1/qemu-storage-daemon.1
8181
man/man1/qemu.1

0 commit comments

Comments
 (0)