From owner-svn-ports-head@freebsd.org Tue Nov 8 02:00:12 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39E2DC34182; Tue, 8 Nov 2016 02:00:12 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE239F7; Tue, 8 Nov 2016 02:00:11 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA820BNP040389; Tue, 8 Nov 2016 02:00:11 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA820A4l040385; Tue, 8 Nov 2016 02:00:10 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201611080200.uA820A4l040385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 8 Nov 2016 02:00:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425656 - in head/emulators/qemu-sbruno: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2016 02:00:12 -0000 Author: sbruno Date: Tue Nov 8 02:00:10 2016 New Revision: 425656 URL: https://svnweb.freebsd.org/changeset/ports/425656 Log: Update and track upstream QEMU 2.7.50 No changes to qemu-user are intended here, nor are there and fixes here. Modified: head/emulators/qemu-sbruno/Makefile head/emulators/qemu-sbruno/distinfo head/emulators/qemu-sbruno/files/patch-Makefile head/emulators/qemu-sbruno/pkg-plist Modified: head/emulators/qemu-sbruno/Makefile ============================================================================== --- head/emulators/qemu-sbruno/Makefile Tue Nov 8 01:57:49 2016 (r425655) +++ head/emulators/qemu-sbruno/Makefile Tue Nov 8 02:00:10 2016 (r425656) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.6.90.g20160728 -PORTREVISION= 1 +PORTVERSION= 2.7.50.g20161024 CATEGORIES= emulators MASTER_SITES= GH \ LOCAL/nox:dtc \ @@ -18,10 +17,11 @@ COMMENT?= QEMU CPU Emulator - github bsd BROKEN_FreeBSD_9= does not build +LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= c47c4e2 +GH_TAGNAME= e0c9a90 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build @@ -71,7 +71,7 @@ USE_GNOME+= glib20 CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" CONFIGURE_ARGS+= --disable-libssh2 -PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt +PORTDOCS= docs qemu-doc.html qmp-commands.txt .if defined(QEMU_USER_STATIC) .if ${ARCH} != "amd64" @@ -243,6 +243,13 @@ CONFIGURE_ARGS+= --sparc_cpu=v9 CONFIGURE_ARGS+= --python=${PYTHON_CMD} +# clang in freebsd 10 is unable to assemble linuxboot_dma.bin +.if (${OSVERSION} < 1100000) +PLIST_SUB+= LINUXBOOT_DMA="@comment " +.else +PLIST_SUB+= LINUXBOOT_DMA="" +.endif + # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: @@ -250,6 +257,16 @@ post-patch: @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure +# clang in freebsd 10 is unable to assemble linuxboot_dma.bin +.if (${OSVERSION} < 1100000) + @${REINPLACE_CMD} -E \ + -e 's|linuxboot_dma.bin||' \ + ${WRKSRC}/pc-bios/optionrom/Makefile + @${REINPLACE_CMD} -E \ + -e 's|linuxboot_dma.bin||' \ + ${WRKSRC}/Makefile +.endif + #.if ${PORT_OPTIONS:MPCAP} # @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch #.endif Modified: head/emulators/qemu-sbruno/distinfo ============================================================================== --- head/emulators/qemu-sbruno/distinfo Tue Nov 8 01:57:49 2016 (r425655) +++ head/emulators/qemu-sbruno/distinfo Tue Nov 8 02:00:10 2016 (r425656) @@ -1,4 +1,7 @@ -SHA256 (qemu/2.6.90.g20160728/seanbruno-qemu-bsd-user-2.6.90.g20160728-c47c4e2_GH0.tar.gz) = e18cf0c11481019a43dc45dc72f720738309c0a5e83c6217cd1cea82ec57173b -SIZE (qemu/2.6.90.g20160728/seanbruno-qemu-bsd-user-2.6.90.g20160728-c47c4e2_GH0.tar.gz) = 12947898 -SHA256 (qemu/2.6.90.g20160728/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.6.90.g201605/dtc-v1.4.0.tar.gz) = 131893 +TIMESTAMP = 1478530214 +SHA256 (qemu/2.7.50.g20161024/seanbruno-qemu-bsd-user-2.7.50.g20161024-e0c9a90_GH0.tar.gz) = 92c19071cb5adee091bd7db72021ff4f2181d5380414d748d92926e71839d9a4 +SIZE (qemu/2.7.50.g20161024/seanbruno-qemu-bsd-user-2.7.50.g20161024-e0c9a90_GH0.tar.gz) = 13104701 +SHA256 (qemu/2.7.50.g20161024/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 +SIZE (qemu/2.7.50.g20161024/dtc-v1.4.0.tar.gz) = 131893 +SHA256 (qemu/2.7.50.g20161024/seanbruno-qemu-bsd-user-2.7.50.g20161024-e0c9a90_GH0.tar.gz) = 92c19071cb5adee091bd7db72021ff4f2181d5380414d748d92926e71839d9a4 +SIZE (qemu/2.7.50.g20161024/seanbruno-qemu-bsd-user-2.7.50.g20161024-e0c9a90_GH0.tar.gz) = 13104701 Modified: head/emulators/qemu-sbruno/files/patch-Makefile ============================================================================== --- head/emulators/qemu-sbruno/files/patch-Makefile Tue Nov 8 01:57:49 2016 (r425655) +++ head/emulators/qemu-sbruno/files/patch-Makefile Tue Nov 8 02:00:10 2016 (r425656) @@ -1,14 +1,13 @@ ---- Makefile.orig 2016-07-11 15:33:10 UTC +--- Makefile.orig 2016-10-24 16:28:22 UTC +++ Makefile -@@ -91,8 +91,12 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -90,7 +90,11 @@ LIBS+=-lz $(LIBS_TOOLS) 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-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 - DOCS+=qmp-commands.txt + DOCS=qemu-doc.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 +endif ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 @@ -18,8 +17,8 @@ install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" +ifndef NOPORTDOCS - $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) $(SRC_PATH)/docs/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" +endif ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" Modified: head/emulators/qemu-sbruno/pkg-plist ============================================================================== --- head/emulators/qemu-sbruno/pkg-plist Tue Nov 8 01:57:49 2016 (r425655) +++ head/emulators/qemu-sbruno/pkg-plist Tue Nov 8 02:00:10 2016 (r425656) @@ -103,7 +103,7 @@ %%SOFTMMU%%%%DATADIR%%/keymaps/tr %%SOFTMMU%%%%DATADIR%%/kvmvapic.bin %%SOFTMMU%%%%DATADIR%%/linuxboot.bin -%%SOFTMMU%%%%DATADIR%%/linuxboot_dma.bin +%%LINUXBOOT_DMA%%%%SOFTMMU%%%%DATADIR%%/linuxboot_dma.bin %%SOFTMMU%%%%DATADIR%%/multiboot.bin %%SOFTMMU%%%%DATADIR%%/openbios-ppc %%SOFTMMU%%%%DATADIR%%/openbios-sparc32