From nobody Tue May 14 21:38:36 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 4Vf8qc6D2pz5L409; Tue, 14 May 2024 21:38:36 +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 4Vf8qc3lQKz4Rt7; Tue, 14 May 2024 21:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722716; 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=+eJpAl4tbZsVK67zGm9g2BgOy1MlSvF2/5a3k2sOcFU=; b=YXAj8YsdVLLgx6ap3+SUmNzZuSbPnliB8WBXI8m1TRZqKRZQS4VWLwlawIDk7/KI/pb1f+ q4TxEl+fjZru7caIVj+dTMmXMQg/4dV1U8KCKrw+m9ybW4IxmfhFslgnnUnQRDzIk9rBYL hDmA9+7MsAO0preFW51bA5aFxxNsf0PefDXmSTqgHaRYUrJ1Evx3uu9mzwR5CpS0KwN3Wl ++48yOp+ab6n2wfvMQWASvbPE9hyIjHlNwN/8h1LjnBfvznt1ATCzSIIeUCNjIAG9JfSQZ usDzzQeZXGmvLC8DNhQWX0Fkh9IO+rYaJVzXdvdA+MFRzoneO1QYdmta5LtyCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722716; a=rsa-sha256; cv=none; b=ogd9J1BJ6xcuFO1/JlpkdtZaiSrA3uRxUvLjC7aab7AFJv7xVh/P5KYBSr7h5AFmjgI1JZ sLOQ95HZRe2MlRz4WkX8u6v7teivGA6dAScsTCOFr8lLJWOCs+cKpKQiZiQSjPZdKVc5HP EZ11+MW2wXvDI/kfBiw63qaqjB4jIg8jqRP8jsd++Ql2u7cnOMpMtsX7TZbtk6RVZF/UvZ MHo3BsQt3L8sPraWUIpgIZUpwg5f2ax3BrgI2UdOL48Zy94Ozs8iJd8IDTQmI5SyPv/0CQ Gr6hf/RNb5/Tv5GzhdXUdx50RAEG4XtRtDeUm3fjebCKTYzRSGvktXTdy/KQgw== 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=1715722716; 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=+eJpAl4tbZsVK67zGm9g2BgOy1MlSvF2/5a3k2sOcFU=; b=QrpN50ui4c264J8pTLS5j2ooTth74Pmq0mMNymfCmatc8vJWgmEB8nbcs8JOsMa9ABtm0/ P1ZsUnkJMK3oaxNAug4smwyK9HozGeUvlaGN/uleEzbou5Nug3nS2vV911yxlGrB1dcZBL GP65ddIUarCkCLseA1/w3I+MCBpy1tCfKBQRnhE60VegnXZqUzSwRKIcGOREryxMpdBWkh QUrPkbhtaxohcWEG7K0lO26bBqb9f+HGfI4LvixIXZdpif513ltSiC4dRqejxuNBsslAgI Dl3+CXeLTf9REXUrzIdrS3RiGnTzuI01iB4HN1vMcXwLvp08BA3DrMFAXVSWkA== 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 4Vf8qc3Jg9zp6W; Tue, 14 May 2024 21:38:36 +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 44ELcaVW093980; Tue, 14 May 2024 21:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELcaDh093977; Tue, 14 May 2024 21:38:36 GMT (envelope-from git) Date: Tue, 14 May 2024 21:38:36 GMT Message-Id: <202405142138.44ELcaDh093977@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: 67f4116a102f - releng/14.1 - release: make dependencies, not recursive make 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 67f4116a102f6a6917f4b329412b0dfa30016e1a Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=67f4116a102f6a6917f4b329412b0dfa30016e1a commit 67f4116a102f6a6917f4b329412b0dfa30016e1a Author: Colin Percival AuthorDate: 2024-05-09 07:52:25 +0000 Commit: Colin Percival CommitDate: 2024-05-14 21:38:17 +0000 release: make dependencies, not recursive make For historical reasons, the vm-release and cloudware-release targets were written as recursive makes of ${VMTARGETS} and ${CLOUDTARGETS}; this worked fine until we started running `make release -jN` and had both VM and cloud targets depending on ${QEMUTGT}, at which point things exploded when we tried to build the port twice at the same time. Switch vm-release and cloudware-release to have make dependencies on their individual components; this way a single make process runs and is aware of the duplicate dependency (and only runs it once). MFC after: 5 days Approved by: re (delphij) (cherry picked from commit ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb) (cherry picked from commit e306ad1c194d464708b4b12277d577d931e6eae9) --- release/Makefile.vm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 6fd165528854..95d48490c353 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -223,14 +223,16 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif -vm-release: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS} +vm-release: ${VMTARGETS} +.else +vm-release: .endif -cloudware-release: .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} +cloudware-release: ${CLOUDTARGETS} +.else +cloudware-release: .endif .include "${.CURDIR}/Makefile.azure"