From nobody Sun Dec 3 22:04:58 2023 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 4Sk17H1Kwzz51grf; Sun, 3 Dec 2023 22:04:59 +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 4Sk17H0WD7z4Dch; Sun, 3 Dec 2023 22:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701641099; 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=6e+1wTRj298e69OWboDQ2aLJvDANoVbBvZ45iHRq+8M=; b=tY/DjxUFkY0d8nr9DxboQrJ+ZUpL0IdgGxVPrSvEkG3Bk3QlPHPRTXNresqcBkMPPQ0t7S aCL9acY29fNY3C59AkrH74OLcOQxw0PlqmAwp9CsAYgLk3VOUpSrEXDiT00S9aacqOFoU0 eF50UDTLfluj/6a9SEVnde83PIeaU6hv1hgSQfdXvj++svnbdStjmMsXjyugajQJZvRa9X d9HJ0ce9xXY73gN15sW8ln9gMxxETEpwNUPfDJ4rILeVngB2pJqUFFrHU5FtJyksOsjDOh A8pSL8v8CrPbIVhSvpA6lmVQiqJLJD/4p1F62YjYd/P5mzrIdbdc6//JdKVDKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701641099; 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=6e+1wTRj298e69OWboDQ2aLJvDANoVbBvZ45iHRq+8M=; b=K3oIwDkg/dA+yXJqWYBMGpE+xOpzw0O8HmjYl47Zv2L7csegC6bWoFW/w6qYuoJEdpdcIw SBIBQLX5OUNO+QF8kxFsoxv+GU6pROZGuSyXUHNNT75oJ3tQv8r3TfTkrtXeA84HzVuZZm PihiTeOWk4g2Kl/MtSoYAQbKkWT8QBDT7lcd9WrBWKNzYLq7Fr87zfVu7bJKbUUoCv2anb vQmSNa7aTWPjjz0yaz3eMI2qAyzopzXcLvLOFcLV7yimSGzAZnq+f3mcbwtcMrW7V1VOt3 3LjVZdg1Ki5V2voPCNEJ4cpGiStmRuGGaJJ+OvOo9UIwt4gtLJ69hYuhW+bIjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701641099; a=rsa-sha256; cv=none; b=qo6XzLo2yrCCoTqPWwVpY4Jje0Eyvzz5fLvB4jzCh9mmb1k3GG7WkdLyG82E67hS4GvBEj 3Oz3vL+9ewcgyV6DDO69srLc58+usk38BR4y5qd5IO4ZTsWKnyxAo23KBHwGXHGXC7WRsP Rmd2lNbtlz6ti4TEOspDznAAHfwaXLICOQwGa9nf8M8BL5VzUl1mfKZ3XfCa4Q2EjgHf1M /C/qPuRo3RSiQhmzpY1LSOIZFJGLpY3KI1/1PP32CrkeiZoJXi7BG4XtB1ZqF4IF1SP/91 8iUPrsK9K96mhGQ/lcP3KvDDT9+hmyUMX5c4cjzWwkk4ZgjGUW6Mavne77mvjQ== 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 4Sk17G6g9Yz1FrT; Sun, 3 Dec 2023 22:04:58 +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 3B3M4wXd056896; Sun, 3 Dec 2023 22:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3M4wvv056893; Sun, 3 Dec 2023 22:04:58 GMT (envelope-from git) Date: Sun, 3 Dec 2023 22:04:58 GMT Message-Id: <202312032204.3B3M4wvv056893@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: 7d0ee5ebd052 - main - release/Makefile.vm: Rework emulator-portinstall 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7d0ee5ebd052d35e323f2d303e467c2cf305ca39 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0ee5ebd052d35e323f2d303e467c2cf305ca39 commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-03 21:39:30 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a7624775d48c..58703de16cf3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -69,8 +69,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -83,9 +81,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -100,7 +102,7 @@ CLEANFILES+= ${_CW:tl}.${_FS}.img \ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw ${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} -cw-${_CW:tl}-${_FS}: emulator-portinstall +cw-${_CW:tl}-${_FS}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \