From nobody Tue Dec 05 23:42:59 2023 X-Original-To: dev-commits-src-branches@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 4SlHCS1lBZz53ddS; Tue, 5 Dec 2023 23:43:00 +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 4SlHCS18Wwz4Kkb; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819780; 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=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=vTHIvYGk7ranT0hMuqdrGSrFiYKcXInwrqC7ZedioIEgYzaYI3i6CXwpcai5sPVlQAEAzU kl7/ZIW/GONI7GJBuaYMnU+esDIM1qG3UubbmrKAWl6XWim21aGM2ujoXUEM1aebhs0RWU XI733HClUs68KZOUGJGJ1XqcHS+yKLz5MmUp+eZNCkJejPLRCd8n7WWsDcqlevkNpYu/TU Rs0AaIQDPDwFF3hZraH4Wmo058CVGQa0nahOC1QQ86dfRLff2AsRGuvwNBUtziEh3vGRT0 kV8+MRHiCkkwcr1UQuRD+CA4yi+8Qsb+kQ1pMEYyG7Kw5qurgOyd75r3SW6WXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819780; a=rsa-sha256; cv=none; b=NWK8MesC8fhkgNLF32pXEMxmp2XibGpPo/PsTsLbV4vuUuRnq8dyjumDaz3H3rx2oqty0K tyzBh9sW0o8UwqyULM6cxiyBHEfxDClQ+aH0GUaCKQ0kaivBDoryrmhE7JGGsTDdr2sodK 16CbKcAyfaz1qgq+bWsEwCKS2JbGGICYDBCF4BWlKHyep4sKM67pNox8b/OH+tN5jhvvLw iMl/SrcaweI7I9dAgaBeuwyFX/7uwH/kLZDmuLt5hGuiwFlS14c0zYQoSH+rrd5XzqgW78 dZ2WLqLj1tDtuDkcP3d0zeK2IlEIjz/eU0yPv0BE7EyYOV4MHfGFEpx0QWW8qw== 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=1701819780; 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=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=i5nXwMl29cZkuUFbHWlFRetWkZ6CMRbF5NlrHh7mLC5SGwe4IL9HkrRf8bbWDfhzJUwYV7 eoCam+6ojb1BbEmQFhsoaL93P5AuWjrDdhlznxInp4xPnUySQ0QnSXCYx1G+No9A1OkvDQ 8vIXw0ylK4BC0YrDWVeKPwdg4dXRg06CSl2/Y5LRW/A/ePEFmioPUo7M95X/Y7s5DY61TY +f5kXVADvSgAv0DOl6Nf1bVe+goYW4XLQECFQzK/NX9JkgcDz3YzHAkkHq4u4VQZmkFDUd q5ClTnw9Wx3ZdS3t235JIVx6VSIWB29OYuy6AuQR1KWZo743dAep3xUHh7hXeA== 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 4SlHCS058PzVLJ; Tue, 5 Dec 2023 23:43:00 +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 3B5Ngxg0045239; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgxE0045236; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:59 GMT Message-Id: <202312052342.3B5NgxE0045236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c2c7340fefe9 - stable/13 - release/Makefile.vm: Rework emulator-portinstall List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c2c7340fefe98db6917af02616c21b53db1d0d56 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c2c7340fefe98db6917af02616c21b53db1d0d56 commit c2c7340fefe98db6917af02616c21b53db1d0d56 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +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") (cherry picked from commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39) --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 171ef227a7f0..27053208c689 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -53,8 +53,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 @@ -67,9 +65,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} @@ -85,7 +87,7 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif -cw-${_CW:tl}: emulator-portinstall +cw-${_CW:tl}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \