Update to capture fixes for signal handling from:

Fix typo in fork_end() in bsd-user/main.c. #32
    https://github.com/seanbruno/qemu-bsd-user/pull/32

Upstream merge and update as well.
This commit is contained in:
Sean Bruno 2017-01-22 20:28:52 +00:00
parent 534c5656a2
commit e39970ebe9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=432158
3 changed files with 16 additions and 13 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
PORTVERSION= 2.8.50.g20161228
PORTREVISION= 1
PORTVERSION= 2.8.50.g20170121
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= a71818b
GH_TAGNAME= 506a08c
HAS_CONFIGURE= yes
USES= gmake pkgconfig bison perl5 python:2,build
USE_PERL5= build

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1482956267
SHA256 (qemu/2.8.50.g20161228/seanbruno-qemu-bsd-user-2.8.50.g20161228-a71818b_GH0.tar.gz) = b8470668654c108b044dee9491bb2d710f3d6402ca820dde1cfa3e4e9b462df7
SIZE (qemu/2.8.50.g20161228/seanbruno-qemu-bsd-user-2.8.50.g20161228-a71818b_GH0.tar.gz) = 13601447
SHA256 (qemu/2.8.50.g20161228/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
SIZE (qemu/2.8.50.g20161228/dtc-v1.4.0.tar.gz) = 131893
SHA256 (qemu/2.8.50.g20170121/seanbruno-qemu-bsd-user-2.8.50.g20170121-506a08c_GH0.tar.gz) = d7552b8e55ff5a0c7de504824318ab7ec1090c402537d2187c406137eae5ffef
SIZE (qemu/2.8.50.g20160121/seanbruno-qemu-bsd-user-2.8.50.g20170121-506a08c_GH0.tar.gz) = 13671923
SHA256 (qemu/2.8.50.g20170121/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
SIZE (qemu/2.8.50.g20170121/dtc-v1.4.0.tar.gz) = 131893

View file

@ -1,24 +1,28 @@
--- Makefile.orig 2016-10-24 16:28:22 UTC
+++ Makefile
@@ -90,7 +90,11 @@ LIBS+=-lz $(LIBS_TOOLS)
--- Makefile.orig 2017-01-21 14:04:07.000000000 -0700
+++ Makefile 2017-01-21 14:18:18.199722000 -0700
@@ -90,9 +90,13 @@
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
+ifdef NOPORTDOCS
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+else
DOCS=qemu-doc.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
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
+endif
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
@@ -430,8 +434,10 @@ endif
@@ -436,10 +440,12 @@
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
+ifndef NOPORTDOCS
$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) $(SRC_PATH)/docs/qmp-commands.txt "$(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)"
+endif
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"