kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qemu: Sync PLIST with reality for Linux

Browse source 
Add new entries to linux-user.
Move PLIST.Linux into main PLIST.
Mark bridge-helper and pr-helper as Linux specific options.

No functional change for !Linux.
Linux packaging should now either work or be closer to it.
This commit is contained in:
kamil 2019-05-24 00:28:52 +00:00
parent 762d89fd76
commit b0dd119431
3 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
emulators/qemu/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.207 2019/04/27 18:00:46 kamil Exp $
# $NetBSD: Makefile,v 1.208 2019/05/24 00:28:52 kamil Exp $
DISTNAME= qemu-4.0.0
PKGREVISION= 5
@ -94,9 +94,19 @@ REPLACE_PERL+= scripts/texi2pod.pl
INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
UE_ARCHS+= or1k ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
UE_ARCHS+= sparc64 x86_64 microblazeel s390x unicore32
UE_ARCHS+= aarch64 aarch64_be
UE_ARCHS+= alpha arm armeb cris
UE_ARCHS+= hppa
UE_ARCHS+= i386
UE_ARCHS+= m68k microblaze microblazeel
UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el
UE_ARCHS+= nios2
UE_ARCHS+= or1k ppc ppc64 ppc64le ppc64abi32
UE_ARCHS+= riscv32 riscv64
UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64
UE_ARCHS+= tilegx
UE_ARCHS+= unicore32
UE_ARCHS+= x86_64 xtensa xtensaeb
.if ${OPSYS} == "NetBSD"
USER_EMUL= i386 x86_64 sparc sparc64
@ -110,14 +120,16 @@ CONFIGURE_ARGS+= --disable-bsd-user
PLIST.nbd= YES
.elif ${OPSYS} == "Linux"
USER_EMUL= ${UE_ARCHS}
PLIST.bridge-helper YES
PLIST.nbd= YES
PLIST.ivshmem= YES
PLIST.pr-helper YES
.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
PLIST.nbd= YES
CONFIGURE_ARGS+= --disable-coroutine-pool
.endif
PLIST_VARS+= ${UE_ARCHS} nbd ivshmem
PLIST_VARS+= ${UE_ARCHS} bridge-helper ivshmem nbd pr-helper
.for pvar in ${USER_EMUL}
PLIST.${pvar}= YES
.endfor

18
emulators/qemu/PLIST
View file

@ -1,11 +1,14 @@
@comment $NetBSD: PLIST,v 1.57 2019/04/25 15:29:02 leot Exp $
@comment $NetBSD: PLIST,v 1.58 2019/05/24 00:28:52 kamil Exp $
bin/elf2dmp
${PLIST.aarch64}bin/qemu-aarch64
${PLIST.aarch64_be}bin/qemu-aarch64_be
${PLIST.alpha}bin/qemu-alpha
${PLIST.arm}bin/qemu-arm
${PLIST.armeb}bin/qemu-armeb
${PLIST.cris}bin/qemu-cris
bin/qemu-edid
bin/qemu-ga
${PLIST.hppa}bin/qemu-hppa
${PLIST.i386}bin/qemu-i386
bin/qemu-img
bin/qemu-io
@ -13,12 +16,21 @@ ${PLIST.m68k}bin/qemu-m68k
${PLIST.microblaze}bin/qemu-microblaze
${PLIST.microblazeel}bin/qemu-microblazeel
${PLIST.mips}bin/qemu-mips
${PLIST.mips64}bin/qemu-mips64
${PLIST.mips64el}bin/qemu-mips64el
${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
${PLIST.ppc64abi32}bin/qemu-ppc64abi32
${PLIST.ppc64le}bin/qemu-ppc64le
${PLIST.pr-helper}bin/qemu-pr-helper
${PLIST.riscv32}bin/qemu-riscv32
${PLIST.riscv64}bin/qemu-riscv64
${PLIST.s390x}bin/qemu-s390x
${PLIST.sh4}bin/qemu-sh4
${PLIST.sh4eb}bin/qemu-sh4eb
@ -56,8 +68,12 @@ bin/qemu-system-unicore32
bin/qemu-system-x86_64
bin/qemu-system-xtensa
bin/qemu-system-xtensaeb
${PLIST.tilegx}bin/qemu-tilegx
${PLIST.unicore32}bin/qemu-unicore32
${PLIST.x86_64}bin/qemu-x86_64
${PLIST.xtensa}bin/qemu-xtensa
${PLIST.xtensaeb}bin/qemu-xtensaeb
${PLIST.bridge-helper}libexec/qemu-bridge-helper
man/man1/qemu-img.1
man/man1/qemu.1
man/man7/qemu-block-drivers.7

8
emulators/qemu/PLIST.Linux
View file

@ -1,8 +0,0 @@
@comment $NetBSD: PLIST.Linux,v 1.4 2015/12/10 02:51:05 joerg Exp $
bin/qemu-aarch64
bin/qemu-mips64
bin/qemu-mips64el
bin/qemu-mipsn32
bin/qemu-mipsn32el
bin/qemu-ppc64le
libexec/qemu-bridge-helper