svn commit: r445254 - in head/emulators/qemu-sbruno: . files
Sean Bruno
sbruno at FreeBSD.org
Fri Jul 7 14:14:07 UTC 2017
Author: sbruno
Date: Fri Jul 7 14:14:06 2017
New Revision: 445254
URL: https://svnweb.freebsd.org/changeset/ports/445254
Log:
Bump qemu-sbruno/qemu-user-static to capture fixes that are now required
in -current in support of mmap() MAP_GUARD.
Thanks to kib@ for the explanations and test program that I used to
come up with a solution.
While here, sync to upstream a bit. This requires a little bit of a
fixup for NODOC builds.
Modified:
head/emulators/qemu-sbruno/Makefile
head/emulators/qemu-sbruno/distinfo
head/emulators/qemu-sbruno/files/patch-Makefile
Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile Fri Jul 7 13:48:17 2017 (r445253)
+++ head/emulators/qemu-sbruno/Makefile Fri Jul 7 14:14:06 2017 (r445254)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 2.9.50.g20170611
-PORTREVISION= 1
+PORTVERSION= 2.9.50.g20170706
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@@ -20,7 +19,7 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= seanbruno
GH_PROJECT= ${PORTNAME}-bsd-user
-GH_TAGNAME= 43acb36
+GH_TAGNAME= e03cb1e
HAS_CONFIGURE= yes
USES= gmake pkgconfig bison perl5 python:2,build
USE_PERL5= build
Modified: head/emulators/qemu-sbruno/distinfo
==============================================================================
--- head/emulators/qemu-sbruno/distinfo Fri Jul 7 13:48:17 2017 (r445253)
+++ head/emulators/qemu-sbruno/distinfo Fri Jul 7 14:14:06 2017 (r445254)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1497278071
-SHA256 (qemu/2.9.50.g20170611/seanbruno-qemu-bsd-user-2.9.50.g20170611-43acb36_GH0.tar.gz) = a3d9aebb2ad5e43ff679dc21cf3d0a5bf18f1d3796e79a97514d093759f465f8
-SIZE (qemu/2.9.50.g20170611/seanbruno-qemu-bsd-user-2.9.50.g20170611-43acb36_GH0.tar.gz) = 14024085
-SHA256 (qemu/2.9.50.g20170611/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
-SIZE (qemu/2.9.50.g20170611/dtc-v1.4.0.tar.gz) = 131893
+TIMESTAMP = 1499375615
+SHA256 (qemu/2.9.50.g20170706/seanbruno-qemu-bsd-user-2.9.50.g20170706-e03cb1e_GH0.tar.gz) = 30d185f1a27e23bddeed213294c2688a0eda84b6ed6bbca1ae4538f5b13cdd22
+SIZE (qemu/2.9.50.g20170706/seanbruno-qemu-bsd-user-2.9.50.g20170706-e03cb1e_GH0.tar.gz) = 14210222
+SHA256 (qemu/2.9.50.g20170706/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
+SIZE (qemu/2.9.50.g20170706/dtc-v1.4.0.tar.gz) = 131893
Modified: head/emulators/qemu-sbruno/files/patch-Makefile
==============================================================================
--- head/emulators/qemu-sbruno/files/patch-Makefile Fri Jul 7 13:48:17 2017 (r445253)
+++ head/emulators/qemu-sbruno/files/patch-Makefile Fri Jul 7 14:14:06 2017 (r445254)
@@ -1,6 +1,6 @@
---- Makefile.orig 2017-01-21 21:04:07.000000000 +0000
-+++ Makefile 2017-01-23 17:32:06.512839000 +0000
-@@ -90,9 +90,13 @@
+--- Makefile.orig 2017-07-06 15:00:58.000000000 -0600
++++ Makefile 2017-07-06 15:18:48.131891000 -0600
+@@ -206,9 +206,13 @@
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
@@ -8,43 +8,41 @@
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+else
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
- DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7
- DOCS+=docs/qemu-ga-ref.html docs/qemu-ga-ref.txt docs/qemu-ga-ref.7
+ DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
+ DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
+endif
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
-@@ -436,15 +440,19 @@
+@@ -564,15 +568,19 @@
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
+ifndef NOPORTDOCS
$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
+endif
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
+ifndef NOPORTDOCS
- $(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
+ $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
+endif
ifneq ($(TOOLS),)
$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
-@@ -452,11 +460,13 @@
+@@ -580,9 +588,11 @@
endif
ifneq (,$(findstring qemu-ga,$(TOOLS)))
$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
+ifndef NOPORTDOCS
- $(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
+ $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
++endif
endif
endif
-+endif
ifdef CONFIG_VIRTFS
- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
More information about the svn-ports-all
mailing list