aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2016-04-29 05:01:44 +0800
committersbruno <sbruno@FreeBSD.org>2016-04-29 05:01:44 +0800
commit1650b3ec8273a403477de20fb14877f0eeeb1b83 (patch)
tree8ff0fe21b27e5b86b36bae0797df255a3fc2cc3a /emulators
parentdb1ba0df077df725f11280b1b1171913b9f66928 (diff)
downloadfreebsd-ports-graphics-1650b3ec8273a403477de20fb14877f0eeeb1b83.tar.gz
freebsd-ports-graphics-1650b3ec8273a403477de20fb14877f0eeeb1b83.tar.zst
freebsd-ports-graphics-1650b3ec8273a403477de20fb14877f0eeeb1b83.zip
Update qemu-sbruno to track upstream at version 2.5.93.
Fix aarch64 bsd-user by aligning the stack properly. (andy turner). https://github.com/seanbruno/qemu-bsd-user/commit/743fbfffc13f5717a8611e7a128c39dd9e3495d7 Fix bsd-user syscall implementation of renameat. (mikael urankar). https://github.com/seanbruno/qemu-bsd-user/pull/20/commits/aa90a1b960f96738ae80778ac13b95508b83842a Fix bsd-user log_file argument handling now that handling of NULL isn't being done by the called functions. https://github.com/seanbruno/qemu-bsd-user/commit/e3d069e8b149b7a1027837cce81b9fe68de85bf1 PR: 208952
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu-sbruno/Makefile4
-rw-r--r--emulators/qemu-sbruno/distinfo8
-rw-r--r--emulators/qemu-sbruno/pkg-plist15
3 files changed, 13 insertions, 14 deletions
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 00444c500c9..2e4e680e052 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 2.5.50.g20160425
+PORTVERSION= 2.5.93.g20160428
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@@ -18,7 +18,7 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch
USE_GITHUB= yes
GH_ACCOUNT= seanbruno
GH_PROJECT= ${PORTNAME}-bsd-user
-GH_TAGNAME= 36f4c00
+GH_TAGNAME= 743fbff
HAS_CONFIGURE= yes
USES= gmake pkgconfig bison perl5 python:2,build
USE_PERL5= build
diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo
index 3f098e74f0d..e7e62396c8e 100644
--- a/emulators/qemu-sbruno/distinfo
+++ b/emulators/qemu-sbruno/distinfo
@@ -1,4 +1,4 @@
-SHA256 (qemu/2.5.50.g20160425/seanbruno-qemu-bsd-user-2.5.50.g20160425-36f4c00_GH0.tar.gz) = 7b27aba83a3f29b089bf0ff678beaf4e6961d23a76597ec080b902f1acafd8da
-SIZE (qemu/2.5.50.g20160425/seanbruno-qemu-bsd-user-2.5.50.g20160425-36f4c00_GH0.tar.gz) = 11855943
-SHA256 (qemu/2.5.50.g20160425/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.5.50.g20160425/dtc-v1.4.0.tar.gz) = 131893
+SHA256 (qemu/2.5.93.g20160428/seanbruno-qemu-bsd-user-2.5.93.g20160428-743fbff_GH0.tar.gz) = 6c46f608839b84540c56679ba2ccacd68fdd12e7ec2ea222a8e0b9e864bea33a
+SIZE (qemu/2.5.93.g20160428/seanbruno-qemu-bsd-user-2.5.93.g20160428-743fbff_GH0.tar.gz) = 12063690
+SHA256 (qemu/2.5.93.g20160428/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.5.93.g201604/dtc-v1.4.0.tar.gz) = 131893
diff --git a/emulators/qemu-sbruno/pkg-plist b/emulators/qemu-sbruno/pkg-plist
index 2a6ff15661f..48c044fc105 100644
--- a/emulators/qemu-sbruno/pkg-plist
+++ b/emulators/qemu-sbruno/pkg-plist
@@ -1,9 +1,9 @@
+%%SOFTMMU%%bin/ivshmem-client
+%%SOFTMMU%%bin/ivshmem-server
%%SOFTMMU%%bin/qemu-ga
%%SOFTMMU%%bin/qemu-img
%%SOFTMMU%%bin/qemu-io
%%SOFTMMU%%bin/qemu-nbd
-%%SOFTMMU%%bin/ivshmem-client
-%%SOFTMMU%%bin/ivshmem-server
%%NONX86%%bin/qemu-system-aarch64
%%NONX86%%bin/qemu-system-alpha
%%NONX86%%bin/qemu-system-arm
@@ -29,6 +29,9 @@
%%NONX86%%bin/qemu-system-sparc64
%%NONX86%%bin/qemu-system-tricore
%%NONX86%%bin/qemu-system-unicore32
+%%SOFTMMU%%bin/qemu-system-x86_64
+%%NONX86%%bin/qemu-system-xtensa
+%%NONX86%%bin/qemu-system-xtensaeb
%%BSD_USER64%%bin/qemu-aarch64%%STATIC%%
%%BSD_USER%%bin/qemu-arm%%STATIC%%
%%BSD_USER%%bin/qemu-i386%%STATIC%%
@@ -41,19 +44,15 @@
%%BSD_USER%%bin/qemu-sparc%%STATIC%%
%%BSD_USER64%%bin/qemu-sparc64%%STATIC%%
%%BSD_USER64%%bin/qemu-x86_64%%STATIC%%
-%%SOFTMMU%%bin/qemu-system-x86_64
-%%NONX86%%bin/qemu-system-xtensa
-%%NONX86%%bin/qemu-system-xtensaeb
+%%SOFTMMU%%@sample etc/qemu-ifup.sample
+%%SOFTMMU%%@sample etc/qemu-ifdown.sample
%%SOFTMMU%%man/man1/qemu.1.gz
%%SOFTMMU%%man/man1/qemu-img.1.gz
%%SOFTMMU%%man/man8/qemu-ga.8.gz
%%SOFTMMU%%man/man8/qemu-nbd.8.gz
-%%SOFTMMU%%@sample etc/qemu-ifup.sample
-%%SOFTMMU%%@sample etc/qemu-ifdown.sample
%%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin
%%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin
%%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml
-%%SOFTMMU%%%%DATADIR%%/q35-acpi-dsdt.aml
%%SOFTMMU%%%%DATADIR%%/bios-256k.bin
%%SOFTMMU%%%%DATADIR%%/bios.bin
%%SOFTMMU%%%%DATADIR%%/efi-e1000.rom