From nobody Thu May 30 17:01:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vqsvy2MsPz5L1Fd; Thu, 30 May 2024 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vqsvy1m4Cz444N; Thu, 30 May 2024 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717088462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnL+RHZQK1XBjwejMKJNZtXvNhbjCb424xESQ0odLvM=; b=CcJaS04Nl3lcb/lLG7BQ3bnJDf2eJgGR2lPsxk6ZnQ6aHePReLzL8fRv/8oYJaXQhkSwp8 8M6/TJfVfJ0RFzO0vx0kkbH1FDOwvEXfkll0COYXBHuTdvYo2vTHDdOs7897fMDtm2rnW1 J43ADCBgsQyacxrGnuY/PPnC7vxGc0yY1pDndHUSJgSPeGtSG5F0yAbuB4QtQBElB36PI1 MudQ9B7WLOKjmn9nytAN0/KCZ1IvBWUTqsPx9UkYB1JGQK7upfXmBlh22c+qivcu5yWG+I w91DX9F62Jtb7Sios1BFw8/WJOl0vdu2/U/RAY9TRhST7xleP1X0tAcKTsbyBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717088462; a=rsa-sha256; cv=none; b=Y/G/BNXGyblxcHscc7R3Dh/Cj/35aJLpVo3cyrCWy3AgfsjW2pNRLWv2iMXfC2gCUUoTIR 31rqvmihFl0m3tsRpewmXeYWB+WqPORgKPlZfhS/D4My4f2f0us9kvBS2nsOPuvf/NguBt DbOa++kpKzINQ0rxQaQQeSnQaqR9vyxIQCJVhGxWHmwOjGooPJfIPDb3scKiFxcMQ6rXeZ lS91uAZ2uAPeZKh/a/h/HTarMdjT1f7a/ECKomilhKojLlyUkrr05Vz4K3zzNkJ/FZ0ej/ LtNYaBoU1DT1EwQIW+8EDmc9cMxLfvl0jUguOl/OrrZBkOoz6ESU9H3Rp98emg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717088462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnL+RHZQK1XBjwejMKJNZtXvNhbjCb424xESQ0odLvM=; b=u1d7XK47Of8khQ2kcnggLQ65CmfjIDuC38y3YIyKxZ/gLaqrt/8KYdVzso9J6f2RKNGPHn 3QgDfjC30itvLRxD0h8vkDuMcAX4cimlHLENeHhYDrkWTfGJvyj9cpKdL6GceBv6pVw5ul h0gwzCCeP8Gj0bHfkIZEbmIbuUZhBQM+GtrO8mDAQpmn5yOJEUNoaT5DJmnLhi11UI9hPK DQbZ3QTToamJiiPROoldDGSNTJVI7xHAU8hg3eAVtW5756ZcPJ9aljrxBGVMQWJlHBa6Ui agNR8TaUFjnh48VkiD9xM8jJ8v3c2aXn4nJVdMaAlUO3N8gcKZNwJlnq2Aa9mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vqsvy1MJ0zpPq; Thu, 30 May 2024 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44UH120W081040; Thu, 30 May 2024 17:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UH12Gx081028; Thu, 30 May 2024 17:01:02 GMT (envelope-from git) Date: Thu, 30 May 2024 17:01:02 GMT Message-Id: <202405301701.44UH12Gx081028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a04ecddfc721 - main - release/Makefile.vm: Use qemu-user-static-devel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a04ecddfc721427fd97fd1fcc27492ebd19ad183 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a04ecddfc721427fd97fd1fcc27492ebd19ad183 commit a04ecddfc721427fd97fd1fcc27492ebd19ad183 Author: Colin Percival AuthorDate: 2024-05-30 16:48:40 +0000 Commit: Colin Percival CommitDate: 2024-05-30 17:00:42 +0000 release/Makefile.vm: Use qemu-user-static-devel This is a newer version of the qemu-user-static code, which is very much out of date. Requested by: imp --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 548b4c1cca3b..b5c1470a6eac 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) -.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) +.if exists(${PORTSDIR}/emulators/qemu-user-static-devel/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH \ - make -C ${PORTSDIR}/emulators/qemu-user-static \ + make -C ${PORTSDIR}/emulators/qemu-user-static-devel \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y .endif - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static-devel .endif .endif touch ${.TARGET}