svn commit: r461121 - in head: . emulators emulators/qemu-cheri emulators/qemu-cheri128 emulators/qemu-cheri128m
Brooks Davis
brooks at FreeBSD.org
Wed Feb 7 01:03:30 UTC 2018
Author: brooks
Date: Wed Feb 7 01:03:29 2018
New Revision: 461121
URL: https://svnweb.freebsd.org/changeset/ports/461121
Log:
Update to a new snapshot.
Consolidate the qemu-cheri ports into one now that they can be built in a
single tree (thanks to arichardson@).
Sponsored by: DARPA, AFRL
Deleted:
head/emulators/qemu-cheri128/
head/emulators/qemu-cheri128m/
Modified:
head/MOVED
head/emulators/Makefile
head/emulators/qemu-cheri/Makefile
head/emulators/qemu-cheri/Makefile.snapshot
head/emulators/qemu-cheri/distinfo
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Feb 6 23:58:03 2018 (r461120)
+++ head/MOVED Wed Feb 7 01:03:29 2018 (r461121)
@@ -9909,3 +9909,5 @@ databases/mysql-proxy||2018-01-31|Has expired: No long
japanese/migemo-emacs23|japanese/migemo-emacs|2018-02-01|Moved to version agnostic name
editors/emacs-nox11|editors/emacs at nox|2018-02-01|Moved to a flavored version
audio/py-mad|audio/py-pymad|2018-02-03|Rename to match PyPI naming
+emulators/qemu-cheri128|emulators/qemu-cheri|2018-02-06|All versions installed in one port
+emulators/qemu-cheri128m|emulators/qemu-cheri|2018-02-06|All versions installed in one port
Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile Tue Feb 6 23:58:03 2018 (r461120)
+++ head/emulators/Makefile Wed Feb 7 01:03:29 2018 (r461121)
@@ -118,8 +118,6 @@
SUBDIR += q4wine
SUBDIR += qemu
SUBDIR += qemu-cheri
- SUBDIR += qemu-cheri128
- SUBDIR += qemu-cheri128m
SUBDIR += qemu-devel
SUBDIR += qemu-launcher
SUBDIR += qemu-ppcnv
Modified: head/emulators/qemu-cheri/Makefile
==============================================================================
--- head/emulators/qemu-cheri/Makefile Tue Feb 6 23:58:03 2018 (r461120)
+++ head/emulators/qemu-cheri/Makefile Wed Feb 7 01:03:29 2018 (r461121)
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 0.d${SNAPDATE}
CATEGORIES= emulators devel
-PKGNAMESUFFIX?= -cheri
+PKGNAMESUFFIX= -cheri
MAINTAINER= brooks at FreeBSD.org
COMMENT?= QEMU emulator with CHERI CPU support
@@ -20,16 +20,15 @@ GH_ACCOUNT= CTSRD-CHERI
GH_TAGNAME= ${QEMU_COMMIT}
HAS_CONFIGURE= yes
-USES= gettext-runtime gmake libtool makeinfo pkgconfig python:2,build
+USES= gettext-runtime gmake libtool makeinfo pkgconfig python:2.7,build
USE_XORG= pixman
USE_GNOME+= glib20
-#MAKE_ENV+= BSD_MAKE="${MAKE}"
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64
.include "Makefile.snapshot"
CONFIGURE_ARGS+= \
- --target-list=cheri-softmmu \
+ --target-list=cheri128-softmmu,cheri128magic-softmmu,cheri256-softmmu \
--disable-curl \
--disable-gtk \
--disable-libssh2 \
@@ -38,7 +37,6 @@ CONFIGURE_ARGS+= \
--disable-kvm \
--disable-vnc-png \
--disable-sdl \
- --disable-smartcard-nss \
--disable-vte \
--disable-xen \
--extra-cflags="-g ${EXTRA_CFLAGS}" \
@@ -46,10 +44,14 @@ CONFIGURE_ARGS+= \
QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX}
PLIST= /dev/null
-PLIST_FILES= bin/${QEMU_SYSTEM_CHERI}
+PLIST_FILES= bin/qemu-system-cheri128 \
+ bin/qemu-system-cheri128magic \
+ bin/qemu-system-cheri256
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \
- ${STAGEDIR}${PREFIX}/bin/${QEMU_SYSTEM_CHERI}
+ ${INSTALL_PROGRAM} ${WRKSRC}/cheri128-softmmu/qemu-system-cheri128 \
+ ${WRKSRC}/cheri128magic-softmmu/qemu-system-cheri128magic \
+ ${WRKSRC}/cheri256-softmmu/qemu-system-cheri256 \
+ ${STAGEDIR}${PREFIX}/bin/
.include <bsd.port.mk>
Modified: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot Tue Feb 6 23:58:03 2018 (r461120)
+++ head/emulators/qemu-cheri/Makefile.snapshot Wed Feb 7 01:03:29 2018 (r461121)
@@ -4,6 +4,6 @@
#
# Generated by: files/gen-Makefile.snapshot.sh.
#
-SNAPDATE= 20171031
+SNAPDATE= 20180205
-QEMU_COMMIT= 977a4022bf41bfd2f9fce067f84936f65d2a63b1
+QEMU_COMMIT= 9c2b379f531ca242f3440e50ea62cd5a6cc81adf
Modified: head/emulators/qemu-cheri/distinfo
==============================================================================
--- head/emulators/qemu-cheri/distinfo Tue Feb 6 23:58:03 2018 (r461120)
+++ head/emulators/qemu-cheri/distinfo Wed Feb 7 01:03:29 2018 (r461121)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509443374
-SHA256 (CTSRD-CHERI-qemu-0.d20171031-977a4022bf41bfd2f9fce067f84936f65d2a63b1_GH0.tar.gz) = 753fdfc013427865dfd7ea684cd0151a300042592ae9c46b6026c9c75bd33709
-SIZE (CTSRD-CHERI-qemu-0.d20171031-977a4022bf41bfd2f9fce067f84936f65d2a63b1_GH0.tar.gz) = 11158023
+TIMESTAMP = 1517857961
+SHA256 (CTSRD-CHERI-qemu-0.d20180205-9c2b379f531ca242f3440e50ea62cd5a6cc81adf_GH0.tar.gz) = 8f26f5aa5c4f24c0ee04799d55be31d26cb6d9af82f49380be0687f6364fa468
+SIZE (CTSRD-CHERI-qemu-0.d20180205-9c2b379f531ca242f3440e50ea62cd5a6cc81adf_GH0.tar.gz) = 14511440
More information about the svn-ports-all
mailing list