diff options
| author | Sean Bruno <sbruno@FreeBSD.org> | 2017-07-17 19:38:56 +0000 |
|---|---|---|
| committer | Sean Bruno <sbruno@FreeBSD.org> | 2017-07-17 19:38:56 +0000 |
| commit | 9a0bfe78ff430c63a8a1136d3c53ac87665b9911 (patch) | |
| tree | da1f7ff27c7295f869e8c0da42ebdaa0df3a9c07 /emulators/qemu-sbruno | |
| parent | 1e4e1d719315b9ef2351a1e4b4cd52fb9bb29728 (diff) | |
| download | ports-9a0bfe78ff430c63a8a1136d3c53ac87665b9911.tar.gz ports-9a0bfe78ff430c63a8a1136d3c53ac87665b9911.zip | |
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.
Notes
Notes:
svn path=/head/; revision=446108
Diffstat (limited to 'emulators/qemu-sbruno')
| -rw-r--r-- | emulators/qemu-sbruno/Makefile | 16 | ||||
| -rw-r--r-- | emulators/qemu-sbruno/distinfo | 8 | ||||
| -rw-r--r-- | emulators/qemu-sbruno/pkg-message | 10 |
3 files changed, 10 insertions, 24 deletions
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index aa3b00b7f982..6edeb83f3259 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -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 <bsd.port.options.mk> 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) diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo index 3081e599c45d..ddaa6349c8af 100644 --- a/emulators/qemu-sbruno/distinfo +++ b/emulators/qemu-sbruno/distinfo @@ -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 diff --git a/emulators/qemu-sbruno/pkg-message b/emulators/qemu-sbruno/pkg-message index 6d6814baf124..e7039d2f295a 100644 --- a/emulators/qemu-sbruno/pkg-message +++ b/emulators/qemu-sbruno/pkg-message @@ -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 - ) |