Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Jan 2016 22:48:49 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407321 - in head/emulators: . qemu-cheri qemu-cheri/files
Message-ID:  <201601262248.u0QMmn4Y096339@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Tue Jan 26 22:48:49 2016
New Revision: 407321
URL: https://svnweb.freebsd.org/changeset/ports/407321

Log:
  Add a port of sson's fork of QEMU with CHERI CPU support.
  
  Sponsored by:	DARPA, AFRL

Added:
  head/emulators/qemu-cheri/
  head/emulators/qemu-cheri/Makefile   (contents, props changed)
  head/emulators/qemu-cheri/Makefile.snapshot   (contents, props changed)
  head/emulators/qemu-cheri/distinfo   (contents, props changed)
  head/emulators/qemu-cheri/files/
  head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh
     - copied, changed from r407278, head/devel/llvm-devel/files/gen-Makefile.snapshot.sh
  head/emulators/qemu-cheri/pkg-descr   (contents, props changed)
  head/emulators/qemu-cheri/pkg-plist   (contents, props changed)
Modified:
  head/emulators/Makefile

Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile	Tue Jan 26 22:34:38 2016	(r407320)
+++ head/emulators/Makefile	Tue Jan 26 22:48:49 2016	(r407321)
@@ -115,6 +115,7 @@
     SUBDIR += py-gns3-converter
     SUBDIR += q4wine
     SUBDIR += qemu
+    SUBDIR += qemu-cheri
     SUBDIR += qemu-devel
     SUBDIR += qemu-launcher
     SUBDIR += qemu-sbruno

Added: head/emulators/qemu-cheri/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-cheri/Makefile	Tue Jan 26 22:48:49 2016	(r407321)
@@ -0,0 +1,38 @@
+# $FreeBSD$ 
+
+PORTNAME=	qemu
+PORTVERSION=	0.d${SNAPDATE}
+CATEGORIES=	emulators devel
+PKGNAMESUFFIX=	-cheri
+
+MAINTAINER=	brooks@FreeBSD.org
+COMMENT=	QEMU emulator with CHERI CPU support
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	CTSRD-CHERI
+GH_TAGNAME=	${QEMU_COMMIT}
+
+HAS_CONFIGURE=	yes
+USES=	gmake libtool pkgconfig python:2,build
+USE_XORG=	pixman
+USE_GNOME+=	glib20
+#MAKE_ENV+=	BSD_MAKE="${MAKE}"
+ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
+
+CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-[0-9]* qemu-sbruno-[0-9]*
+
+.include "Makefile.snapshot"
+
+CONFIGURE_ARGS+= \
+		--target-list=cheri-softmmu \
+		--disable-gtk \
+		--disable-linux-user \
+		--disable-linux-aio \
+		--disable-kvm \
+		--disable-smartcard-nss \
+		--disable-vte \
+		--disable-xen \
+		--extra-cflags=-g \
+		--localstatedir=/var
+
+.include <bsd.port.mk>

Added: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-cheri/Makefile.snapshot	Tue Jan 26 22:48:49 2016	(r407321)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# Generated file!  Do not edit!  
+#
+# Generated by: files/gen-Makefile.snapshot.sh.
+#
+SNAPDATE=	20160119
+
+QEMU_COMMIT=		d544cf7d537fadba2e3b914a13b3e3c99bd9e7d0

Added: head/emulators/qemu-cheri/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-cheri/distinfo	Tue Jan 26 22:48:49 2016	(r407321)
@@ -0,0 +1,2 @@
+SHA256 (CTSRD-CHERI-qemu-0.d20160119-d544cf7d537fadba2e3b914a13b3e3c99bd9e7d0_GH0.tar.gz) = b281f1e9a4370e36b31949f79c65842e0383ed989e8e504884789695b6252198
+SIZE (CTSRD-CHERI-qemu-0.d20160119-d544cf7d537fadba2e3b914a13b3e3c99bd9e7d0_GH0.tar.gz) = 11139010

Copied and modified: head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh (from r407278, head/devel/llvm-devel/files/gen-Makefile.snapshot.sh)
==============================================================================
--- head/devel/llvm-devel/files/gen-Makefile.snapshot.sh	Tue Jan 26 15:54:36 2016	(r407278, copy source)
+++ head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh	Tue Jan 26 22:48:49 2016	(r407321)
@@ -6,7 +6,7 @@
 
 get_repo_sha()
 {
-	curl https://api.github.com/repos/llvm-mirror/$1/branches/master | \
+	curl https://api.github.com/repos/CTSRD-CHERI/$1/branches/qemu-cheri | \
 	    jq -r '.commit.sha'
 }
 
@@ -17,15 +17,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	3.8
-LLVM_RELEASE=	\${LLVM_MAJOR}.0
 SNAPDATE=	$(date +%Y%m%d)
 
-LLVM_COMMIT=		$(get_repo_sha llvm)
-CLANG_COMMIT=		$(get_repo_sha clang)
-COMPILER_RT_COMMIT=	$(get_repo_sha compiler-rt)
-EXTRAS_COMMIT=		$(get_repo_sha clang-tools-extra)
-LLD_COMMIT=		$(get_repo_sha lld)
-LLDB_COMMIT=		$(get_repo_sha lldb)
-OPENMP_COMMIT=		$(get_repo_sha openmp)
+QEMU_COMMIT=		$(get_repo_sha qemu)
 EOF

Added: head/emulators/qemu-cheri/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-cheri/pkg-descr	Tue Jan 26 22:48:49 2016	(r407321)
@@ -0,0 +1,3 @@
+The QEMU emulator with CHERI CPU support.
+
+WWW: https://github.com/CTSRD-CHERI/qemu

Added: head/emulators/qemu-cheri/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-cheri/pkg-plist	Tue Jan 26 22:48:49 2016	(r407321)
@@ -0,0 +1,92 @@
+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
+share/man/man1/qemu.1
+share/man/man8/qemu-nbd.8
+%%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601262248.u0QMmn4Y096339>