From nobody Tue Dec 05 23:40:19 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 4SlH8M2lDcz53d5w; Tue, 5 Dec 2023 23:40:19 +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 4SlH8M2Gbpz4JtZ; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819619; 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=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=ZyRabkGq2AzWrGyA/TaoAQchgxnHkTebH0L90bCw9olzBbirCk40nDTGFxUDZE5t00WI2w zlCHilLqYEzvpUu4HOl3wzwZhHu17nNwWf1hyRw6DrAiAnPhvY4IeJcUk5gMQ7krfV7e6X JIySjYYE/knGhkDwnKTU8hpkJMRodKXdAF3Juw22ZHzEIwT2KGBpkhjbo4cjn4OUVHiMFF dERULe6UhpJjpNMlx436ucxkv8jjP6cY21ighrIODCEiGw3eWRF4ZZwLbNWvEY8GJSTART LwuhMB6v0KFu0vumHpmLeijKrOk7Zf6Jj/PyHzZz0CpUIuRan0R8cmWz/5qTlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819619; a=rsa-sha256; cv=none; b=kZ1JYOXuVkB816kBUTPnigeXv5odmotYtTko1e0kj+SgTYPjUyQbSeO1J12J0XqkyQ87ah QYrkvrf7t7oQX7WI3M4hmXHAZXyapSxj9O2GQAUxSqNRYNBy11jOWK9/ubslUiMxA/3i6M yM0FSywh45gZAaKkI1v+84Aof9oZAQGZVLL47Fb1PjVtvmFMfViD9f1Mg9tPegYdUV7OOc FcxobDybp2T+WUZ7OyMM2iHQ0oj0XXhsBk1v50r1nBXcDesBdr4MCh19oZRUVoZGuhf821 xOLFX5nYGg+27Bf7pJ6udKH5mLw9I2jgA2nkwRRuch/ROC4bHXhHTItOA4fhQw== 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=1701819619; 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=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=xXCA3vIBoIJPmThWL/pThiTtMNzCd3cyYAhBnYSeO8asBDvK5BXIcQlSvInsu1IpMdWHT8 FV+ygbnkRc+4Y0sTWdlx5jg9XPNTmY+xOoB0f611+FHAzGPkadgo02ZlZIacK3YfXmqSCu 2A9nMcG+0a4lu554jB0tw/Sn2vWmadiqfxcyZWgZt5wii+GxxpnHTvLWWk7Xh3sB9NrPkY E3XL6HkcfxZwfFuEO6N00GZ+xc8eQL5LBTGHKVX7AVnOsB+JFva1n2R9f8jhCnOkjujh0L d7rKDp6+ZG3aIrOlImSFC+H5Dwv0jeo/bRiM7DmKEz08/Qs7k8nRIpCo4plu/A== 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 4SlH8M11cQzVsl; Tue, 5 Dec 2023 23:40:19 +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 3B5NeJFL038011; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeJw2038008; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:19 GMT Message-Id: <202312052340.3B5NeJw2038008@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: 9fc78b60eda4 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 commit 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:06 +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 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} \