From owner-svn-ports-head@freebsd.org Fri Aug 25 22:53:18 2017 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 49DCDDE3338; Fri, 25 Aug 2017 22:53:18 +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 2688B73DC7; Fri, 25 Aug 2017 22:53:18 +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 v7PMrHxd021033; Fri, 25 Aug 2017 22:53:17 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7PMrG7o021028; Fri, 25 Aug 2017 22:53:16 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201708252253.v7PMrG7o021028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 25 Aug 2017 22:53:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448742 - in head/emulators/qemu-sbruno: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: in head/emulators/qemu-sbruno: . files X-SVN-Commit-Revision: 448742 X-SVN-Commit-Repository: ports 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: Fri, 25 Aug 2017 22:53:18 -0000 Author: sbruno Date: Fri Aug 25 22:53:16 2017 New Revision: 448742 URL: https://svnweb.freebsd.org/changeset/ports/448742 Log: Bump qemu-sbruno to chase qemu release candidates. Add redirection for "armv7" so the poudriere can be tested for this target when its ready. Fix bsd-mem.h do_obreak() to invoke an mmap() with a proper -1 argument for the fd argument. Submitted by: Mikael Urankanar Modified: head/emulators/qemu-sbruno/Makefile head/emulators/qemu-sbruno/distinfo head/emulators/qemu-sbruno/files/qemu_user_static.in head/emulators/qemu-sbruno/pkg-plist Modified: head/emulators/qemu-sbruno/Makefile ============================================================================== --- head/emulators/qemu-sbruno/Makefile Fri Aug 25 21:08:52 2017 (r448741) +++ head/emulators/qemu-sbruno/Makefile Fri Aug 25 22:53:16 2017 (r448742) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.9.50.g20170721 +PORTVERSION= 2.9.94.g20170825 CATEGORIES= emulators MASTER_SITES= GH PKGNAMESUFFIX?= -sbruno @@ -16,7 +16,7 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= 17977d0 +GH_TAGNAME= 2dbc44a HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build @@ -299,7 +299,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* .endif .include Modified: head/emulators/qemu-sbruno/distinfo ============================================================================== --- head/emulators/qemu-sbruno/distinfo Fri Aug 25 21:08:52 2017 (r448741) +++ head/emulators/qemu-sbruno/distinfo Fri Aug 25 22:53:16 2017 (r448742) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500667034 -SHA256 (qemu/2.9.50.g20170721/seanbruno-qemu-bsd-user-2.9.50.g20170721-17977d0_GH0.tar.gz) = 4c637b3db30a002e51a676787304c8fdaca0321678d4386210491964b6727ad3 -SIZE (qemu/2.9.50.g20170721/seanbruno-qemu-bsd-user-2.9.50.g20170721-17977d0_GH0.tar.gz) = 14562658 +TIMESTAMP = 1503667589 +SHA256 (qemu/2.9.94.g20170825/seanbruno-qemu-bsd-user-2.9.94.g20170825-2dbc44a_GH0.tar.gz) = 3fc2f3532a0e4c809c9a070f0616a46ab3110c2829f3271012c1ecd19f4741a2 +SIZE (qemu/2.9.94.g20170825/seanbruno-qemu-bsd-user-2.9.94.g20170825-2dbc44a_GH0.tar.gz) = 14636493 Modified: head/emulators/qemu-sbruno/files/qemu_user_static.in ============================================================================== --- head/emulators/qemu-sbruno/files/qemu_user_static.in Fri Aug 25 21:08:52 2017 (r448741) +++ head/emulators/qemu-sbruno/files/qemu_user_static.in Fri Aug 25 22:53:16 2017 (r448742) @@ -54,6 +54,16 @@ list_cmd="${BINMISCCTL} list" else echo "$0: interpreter ${interpreter} not found, cannot register." fi + # register armv7 interpreter styled 'arm' + interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX} + if [ -x "${interpreter}" ]; then + ${BINMISCCTL} add armv7 --interpreter "${interpreter}" \ + --magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ + --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ + --size 20 --set-enabled + else + echo "$0: interpreter ${interpreter} not found, cannot register." + fi # register aarch64 interpreter styled 'aarch64' interpreter=${QEMU_DIR}/${QEMU_PREFIX}aarch64${QEMU_SUFFIX} if [ -x "${interpreter}" ]; then Modified: head/emulators/qemu-sbruno/pkg-plist ============================================================================== --- head/emulators/qemu-sbruno/pkg-plist Fri Aug 25 21:08:52 2017 (r448741) +++ head/emulators/qemu-sbruno/pkg-plist Fri Aug 25 22:53:16 2017 (r448742) @@ -1,5 +1,3 @@ -%%SOFTMMU%%bin/ivshmem-client -%%SOFTMMU%%bin/ivshmem-server %%SOFTMMU%%bin/qemu-ga %%SOFTMMU%%bin/qemu-img %%SOFTMMU%%bin/qemu-io