From nobody Mon May 13 22:24:48 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 4VdYvN2Ycyz5L4HC; Mon, 13 May 2024 22:24:48 +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 4VdYvN1FYPz3xy5; Mon, 13 May 2024 22:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639088; 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=MafzNct8wA/w+NxqjHAn5Sf1FP9S7R+f6LPjGmPUqf8=; b=qO7pdI+BJBSZ59sBY75mcj8KstjgYA+1bY9m8v9/XTXwR3UH+7qG9ZD6UPj3WrbcF7s93F FcrRT1lSKS4RmekAXYRDrJghfo1r5o8qqnE5PpFsBvyEX1Y1wbhFWY4neg0jzuA0ru40jj VSB0LIZhvHRchoiKUeey4r9n+1e2fo/lEgNGPtEaNSsEZ7AQnahK2BUY/AOXxb3bCKJfsI YubujsPp4iUIkK651uTiFOIOODFckCot94HaUJNdOYF7IxSR4l4GrYiZrvSoOgNScf06Ev IDgcd+7FIQbk/eFq/Q9RRR7ONoUL5g8es+u15Be5Fg2x4GL+Om4fnnmdxpFx0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639088; a=rsa-sha256; cv=none; b=HvXekaggTK47C6fVSPqKyPt8mZVBX8BVeEq2h8pujlvZImVzUaHbM+FRJR/gF1fLGLAgqt XL4CGJ9iLCeJ0jXI8XW4FIrOUlEANRYNMjVNfd2jB6+Gy6rEs6syibzX0u+0Cc4XxsQbIz mQAvhfjyNNrM8JxrpF4w7MODxWNdjrTS6L8Z/QTwMJsTJpBscZUiMNVbnKXnL8G+Rsh5vX oAlLTDxlTT0Dz/rzootC4/CIa32Yg8qAd03y+Xoo2G0MHAhpvaOP/TUSp++yZZ2zCXrIAS ct7tC5vKM1FBo4835c4rVkvzWs34VTCPATR8TSFjet650cvAh2rIRcRYYNiauw== 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=1715639088; 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=MafzNct8wA/w+NxqjHAn5Sf1FP9S7R+f6LPjGmPUqf8=; b=JTLiFEJWe+I9G5zNaOfXE5PlSCE4MOcyjnPqEH2dcXaHf28yvit75QVFaO8ClDuDhZ1jw3 5ch+93zmxNwax8BKwjd3R5JhoEOuAw7VEprtnbcWj7bmpX44NYjsdFZwqoj3IKxOUppKYY 6cpDx42CKSHfaG674rNENqxxDdZ6IN+KBQtN/LH/YqycEaRL5NcKPjFhnu/z1VLa/ffUiD I6RLXrU9NXNLV/YPeSHhE45wD4DRZ7Ra7VDxyqCXkgENFzILS/fl1sajnSpJlErrQ8CLaS zaqJv1uYgdrtPZA7LrX4uX80Mwkr3zTEKQBWVtkQUkxl7JUuIUYorHgB3jbuHg== 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 4VdYvN0pJlz15sg; Mon, 13 May 2024 22:24:48 +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 44DMOmL8041178; Mon, 13 May 2024 22:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOmp8041175; Mon, 13 May 2024 22:24:48 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:48 GMT Message-Id: <202405132224.44DMOmp8041175@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: e306ad1c194d - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e306ad1c194d464708b4b12277d577d931e6eae9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e306ad1c194d464708b4b12277d577d931e6eae9 commit e306ad1c194d464708b4b12277d577d931e6eae9 Author: Colin Percival AuthorDate: 2024-05-09 07:52:25 +0000 Commit: Colin Percival CommitDate: 2024-05-13 22:24:28 +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 (cherry picked from commit ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb) --- 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"