From owner-svn-ports-all@freebsd.org Mon Jul 17 19:38:57 2017 Return-Path: Delivered-To: svn-ports-all@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 A6DD0D9EF01; Mon, 17 Jul 2017 19:38:57 +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 80BB16E9D8; Mon, 17 Jul 2017 19:38:57 +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 v6HJcu6N016903; Mon, 17 Jul 2017 19:38:56 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HJcu8q016900; Mon, 17 Jul 2017 19:38:56 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201707171938.v6HJcu8q016900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 17 Jul 2017 19:38:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446108 - head/emulators/qemu-sbruno X-SVN-Group: ports-head X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: head/emulators/qemu-sbruno X-SVN-Commit-Revision: 446108 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2017 19:38:57 -0000 Author: sbruno Date: Mon Jul 17 19:38:56 2017 New Revision: 446108 URL: https://svnweb.freebsd.org/changeset/ports/446108 Log: Sync to QEMU for today. Switch to using sysutils/dtc for libfdt with qemu-sbruno, remove use of nox's homedir for providing dtc/libfdt and remove it as a build depend in the qemu-user-static path if it was even being built. Modified: head/emulators/qemu-sbruno/Makefile head/emulators/qemu-sbruno/distinfo head/emulators/qemu-sbruno/pkg-message Modified: head/emulators/qemu-sbruno/Makefile ============================================================================== --- head/emulators/qemu-sbruno/Makefile Mon Jul 17 19:36:46 2017 (r446107) +++ head/emulators/qemu-sbruno/Makefile Mon Jul 17 19:38:56 2017 (r446108) @@ -2,14 +2,11 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.9.50.g20170711 +PORTVERSION= 2.9.50.g20170717 CATEGORIES= emulators -MASTER_SITES= GH \ - LOCAL/nox:dtc \ - http://people.freebsd.org/~nox/tmp/distfiles/:dtc +MASTER_SITES= GH PKGNAMESUFFIX?= -sbruno -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - dtc-v1.4.0${EXTRACT_SUFX}:dtc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= sbruno@FreeBSD.org @@ -19,7 +16,7 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= 1c182c5 +GH_TAGNAME= cb766f5 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build @@ -67,12 +64,14 @@ USE_XORG= pixman BUILD_DEPENDS+= ${LOCALBASE}/lib/libglib-2.0.a:devel/glib20 .else USE_GNOME+= glib20 +BUILD_DEPENDS+= ${LOCALBASE}/lib/libfdt.so:sysutils/dtc .endif .include CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" +CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --extra-cflags=-I${LOCALBASE}/include CONFIGURE_ARGS+= --disable-libssh2 PORTDOCS= docs qemu-doc.html @@ -253,7 +252,6 @@ PLIST_SUB+= LINUXBOOT_DMA="" .endif post-patch: - @${MV} ${WRKDIR}/dtc ${WRKSRC} @${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) Modified: head/emulators/qemu-sbruno/distinfo ============================================================================== --- head/emulators/qemu-sbruno/distinfo Mon Jul 17 19:36:46 2017 (r446107) +++ head/emulators/qemu-sbruno/distinfo Mon Jul 17 19:38:56 2017 (r446108) @@ -1,5 +1,3 @@ -TIMESTAMP = 1499792378 -SHA256 (qemu/2.9.50.g20170711/seanbruno-qemu-bsd-user-2.9.50.g20170711-1c182c5_GH0.tar.gz) = 2abe9de521335fcf7b596ec344e11d394a185851f0e1ff49b67855087c87a973 -SIZE (qemu/2.9.50.g20170711/seanbruno-qemu-bsd-user-2.9.50.g20170711-1c182c5_GH0.tar.gz) = 14209487 -SHA256 (qemu/2.9.50.g20170711/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.9.50.g20170711/dtc-v1.4.0.tar.gz) = 131893 +TIMESTAMP = 1500307124 +SHA256 (qemu/2.9.50.g20170717/seanbruno-qemu-bsd-user-2.9.50.g20170717-cb766f5_GH0.tar.gz) = 324cb4c2001a0ccc9d20e244ea5a4b23ce52eae2bff9c3925d3fad8fce1287c1 +SIZE (qemu/2.9.50.g20170717/seanbruno-qemu-bsd-user-2.9.50.g20170717-cb766f5_GH0.tar.gz) = 14562773 Modified: head/emulators/qemu-sbruno/pkg-message ============================================================================== --- head/emulators/qemu-sbruno/pkg-message Mon Jul 17 19:36:46 2017 (r446107) +++ head/emulators/qemu-sbruno/pkg-message Mon Jul 17 19:38:56 2017 (r446108) @@ -169,14 +169,4 @@ processing error - resetting ehci HC messages on qemu's tty try disabling TSO etc on the host interface at least while using pcap. -- kqemu is no longer supported in qemu upstream after the 0.11 branch - was created, which means also not in this version. (Linux has moved - on to kvm now for qemu(-like) virtualization needs, so if you want qemu - to go faster and don't want to switch to virtualbox or stick to the older - emulators/qemu port which is at 0.11.1 atm and as such still supports - kqemu you should help getting the FreeBSD kvm port updated and - completed: - - http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD - )