Date: Tue, 30 Jul 2019 02:46:23 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507618 - in head/emulators/qemu-sbruno: . files Message-ID: <201907300246.x6U2kNoq014864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Tue Jul 30 02:46:22 2019 New Revision: 507618 URL: https://svnweb.freebsd.org/changeset/ports/507618 Log: qemu-sbruno: - fix qemu-user-static hangs with wc -l // - add qemu-user-static redirection for riscv64, no support, yet. Thanks to kevans, miki and others for fixing this nonsense. Submitted by: kevans miki Modified: head/emulators/qemu-sbruno/Makefile head/emulators/qemu-sbruno/distinfo head/emulators/qemu-sbruno/files/qemu_user_static.in Modified: head/emulators/qemu-sbruno/Makefile ============================================================================== --- head/emulators/qemu-sbruno/Makefile Tue Jul 30 00:56:49 2019 (r507617) +++ head/emulators/qemu-sbruno/Makefile Tue Jul 30 02:46:22 2019 (r507618) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.11.50.g20190718 +PORTVERSION= 2.11.50.g20190729 CATEGORIES= emulators PKGNAMESUFFIX?= -sbruno DIST_SUBDIR= qemu/${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch LICENSE= GPLv2 USE_GITHUB= yes -GH_TUPLE= seanbruno:qemu-bsd-user:4ffcb32 \ +GH_TUPLE= seanbruno:qemu-bsd-user:f40ca6f7d \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2.7,build Modified: head/emulators/qemu-sbruno/distinfo ============================================================================== --- head/emulators/qemu-sbruno/distinfo Tue Jul 30 00:56:49 2019 (r507617) +++ head/emulators/qemu-sbruno/distinfo Tue Jul 30 02:46:22 2019 (r507618) @@ -1,5 +1,5 @@ -TIMESTAMP = 1563461532 -SHA256 (qemu/2.11.50.g20190718/seanbruno-qemu-bsd-user-2.11.50.g20190718-4ffcb32_GH0.tar.gz) = 6d3495ef3a4b0e546eb957a36e519d97d3d0aec255c44678f1fd5dbdfcbf1508 -SIZE (qemu/2.11.50.g20190718/seanbruno-qemu-bsd-user-2.11.50.g20190718-4ffcb32_GH0.tar.gz) = 15503141 -SHA256 (qemu/2.11.50.g20190718/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a -SIZE (qemu/2.11.50.g20190718/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895 +TIMESTAMP = 1564451439 +SHA256 (qemu/2.11.50.g20190729/seanbruno-qemu-bsd-user-2.11.50.g20190729-f40ca6f7d_GH0.tar.gz) = ac96eeb716464ea70d3cd0233b0e437e98aa84fc1f6d57f706cb349aa576fb99 +SIZE (qemu/2.11.50.g20190729/seanbruno-qemu-bsd-user-2.11.50.g20190729-f40ca6f7d_GH0.tar.gz) = 15508827 +SHA256 (qemu/2.11.50.g20190729/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a +SIZE (qemu/2.11.50.g20190729/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895 Modified: head/emulators/qemu-sbruno/files/qemu_user_static.in ============================================================================== --- head/emulators/qemu-sbruno/files/qemu_user_static.in Tue Jul 30 00:56:49 2019 (r507617) +++ head/emulators/qemu-sbruno/files/qemu_user_static.in Tue Jul 30 02:46:22 2019 (r507618) @@ -124,6 +124,16 @@ list_cmd="${BINMISCCTL} list" else echo "$0: interpreter ${interpreter} not found, cannot register." fi + # register riscv64 interpreter styled 'riscv64' + interpreter=${QEMU_DIR}/${QEMU_PREFIX}riscv64${QEMU_SUFFIX} + if [ -x "${interpreter}" ]; then + ${BINMISCCTL} add riscv64 --interpreter "${interpreter}" \ + --magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\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 sparc64 interpreter styled 'sparc64' interpreter=${QEMU_DIR}/${QEMU_PREFIX}sparc64${QEMU_SUFFIX} if [ -x "${interpreter}" ]; then @@ -147,6 +157,7 @@ list_cmd="${BINMISCCTL} list" ${BINMISCCTL} remove mipsel ${BINMISCCTL} remove powerpc ${BINMISCCTL} remove powerpc64 + ${BINMISCCTL} remove riscv64 ${BINMISCCTL} remove sparc64 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907300246.x6U2kNoq014864>