cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup a few things in emulators/qemu-cheri. No functional change.

Browse Source 
- Remove unused pkg-plist and PLIST=/dev/null setting to ignore it.
- Remove unused QEMU_SYSTEM_CHERI variable.
- Synchronize USES with emulators/qemu a bit.

Reviewed by:	brooks (maintainer)
Approved by:	brooks
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D25529
This commit is contained in:
John Baldwin 2020-07-01 18:09:19 +00:00
parent 71b2c4b719
commit cf0b2f051e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=540986
2 changed files with 4 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emulators/qemu-cheri/Makefile
View File

@ -26,11 +26,12 @@ GH_TUPLE= CTSRD-CHERI:qemu:${QEMU_COMMIT} \
qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \
HAS_CONFIGURE= yes
USES= compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
python:build xorg
USES= compiler:c11 gettext-runtime gl gmake gnome iconv:wchar_t perl5 \
pkgconfig python:build xorg
USE_XORG= pixman
USE_GNOME+= glib20 libxml2
USE_GL+= gbm
USE_PERL5= build
USE_GL+= gl
ONLY_FOR_ARCHS= amd64 powerpc64
OPTIONS_DEFINE= DOCS
@ -55,8 +56,6 @@ CONFIGURE_ARGS+= \
--localstatedir=/var
EXTRA_CFLAGS= -DCHERI_UNALIGNED
QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX}
PLIST= /dev/null
PLIST_FILES= bin/qemu-system-cheri128 \
bin/qemu-system-cheri128magic \
bin/qemu-system-riscv64cheri

92
emulators/qemu-cheri/pkg-plist
View File

@ -1,92 +0,0 @@
bin/qemu-ga
bin/qemu-img
bin/qemu-io
bin/qemu-nbd
bin/qemu-system-cheri
%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
%%PORTDOCS%%%%DOCSDIR%%/qmp-commands.txt
share/man/man1/qemu-img.1.gz
share/man/man1/qemu.1.gz
share/man/man8/qemu-nbd.8.gz
%%DATADIR%%/QEMU,cgthree.bin
%%DATADIR%%/QEMU,tcx.bin
%%DATADIR%%/acpi-dsdt.aml
%%DATADIR%%/bamboo.dtb
%%DATADIR%%/bios-256k.bin
%%DATADIR%%/bios.bin
%%DATADIR%%/efi-e1000.rom
%%DATADIR%%/efi-eepro100.rom
%%DATADIR%%/efi-ne2k_pci.rom
%%DATADIR%%/efi-pcnet.rom
%%DATADIR%%/efi-rtl8139.rom
%%DATADIR%%/efi-virtio.rom
%%DATADIR%%/keymaps/ar
%%DATADIR%%/keymaps/bepo
%%DATADIR%%/keymaps/common
%%DATADIR%%/keymaps/cz
%%DATADIR%%/keymaps/da
%%DATADIR%%/keymaps/de
%%DATADIR%%/keymaps/de-ch
%%DATADIR%%/keymaps/en-gb
%%DATADIR%%/keymaps/en-us
%%DATADIR%%/keymaps/es
%%DATADIR%%/keymaps/et
%%DATADIR%%/keymaps/fi
%%DATADIR%%/keymaps/fo
%%DATADIR%%/keymaps/fr
%%DATADIR%%/keymaps/fr-be
%%DATADIR%%/keymaps/fr-ca
%%DATADIR%%/keymaps/fr-ch
%%DATADIR%%/keymaps/hr
%%DATADIR%%/keymaps/hu
%%DATADIR%%/keymaps/is
%%DATADIR%%/keymaps/it
%%DATADIR%%/keymaps/ja
%%DATADIR%%/keymaps/lt
%%DATADIR%%/keymaps/lv
%%DATADIR%%/keymaps/mk
%%DATADIR%%/keymaps/modifiers
%%DATADIR%%/keymaps/nl
%%DATADIR%%/keymaps/nl-be
%%DATADIR%%/keymaps/no
%%DATADIR%%/keymaps/pl
%%DATADIR%%/keymaps/pt
%%DATADIR%%/keymaps/pt-br
%%DATADIR%%/keymaps/ru
%%DATADIR%%/keymaps/sl
%%DATADIR%%/keymaps/sv
%%DATADIR%%/keymaps/th
%%DATADIR%%/keymaps/tr
%%DATADIR%%/kvmvapic.bin
%%DATADIR%%/linuxboot.bin
%%DATADIR%%/multiboot.bin
%%DATADIR%%/openbios-ppc
%%DATADIR%%/openbios-sparc32
%%DATADIR%%/openbios-sparc64
%%DATADIR%%/palcode-clipper
%%DATADIR%%/petalogix-ml605.dtb
%%DATADIR%%/petalogix-s3adsp1800.dtb
%%DATADIR%%/ppc_rom.bin
%%DATADIR%%/pxe-e1000.rom
%%DATADIR%%/pxe-eepro100.rom
%%DATADIR%%/pxe-ne2k_pci.rom
%%DATADIR%%/pxe-pcnet.rom
%%DATADIR%%/pxe-rtl8139.rom
%%DATADIR%%/pxe-virtio.rom
%%DATADIR%%/q35-acpi-dsdt.aml
%%DATADIR%%/qemu-icon.bmp
%%DATADIR%%/qemu_logo_no_text.svg
%%DATADIR%%/s390-ccw.img
%%DATADIR%%/s390-zipl.rom
%%DATADIR%%/sgabios.bin
%%DATADIR%%/slof.bin
%%DATADIR%%/spapr-rtas.bin
%%DATADIR%%/trace-events
%%DATADIR%%/u-boot.e500
%%DATADIR%%/vgabios-cirrus.bin
%%DATADIR%%/vgabios-qxl.bin
%%DATADIR%%/vgabios-stdvga.bin
%%DATADIR%%/vgabios-virtio.bin
%%DATADIR%%/vgabios-vmware.bin
%%DATADIR%%/vgabios.bin