From nobody Thu May 09 07:56:00 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 4VZkpn1jJyz5KnwZ; Thu, 09 May 2024 07:56:01 +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 4VZkpn1GjMz4Wyr; Thu, 9 May 2024 07:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715241361; 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=OQATEEKFSMEN7d2tBv2F9rkgmKMeIm5zhUAsb/H+soQ=; b=ITaUT77mThOXAjCJ/kyXDWx8xOofEYcMfTor14SOYhqP78l0Rl5QgVXWLuJLLpZkWi9jEe 4fhKGAvtIX//9ohzYSUKiyqQ8r4CkhPibt7PXRVXGHuAxewnwommjQ5nqbvc7aUTvNSqNT +tkew9eDNpMWoWn5cmoaO5KOcJZM7GNQVbozzzb7jzAcZroAhVEkohVnUkcl78QtSGGo6Q EN3hJPoi2M9rAP4jEKmtzqpg6ws+zQlS8SUYiGQQOtP8K4eUgUi9rhieqlAXXY9GbFKgwh bAc1YDVd5sYZUa9McDhU5+vvvf4vqZjAlQk7gkR54+EFbnhKu55atnM9f0HslQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715241361; a=rsa-sha256; cv=none; b=pLP7loxKmq+p8tq2OcZ2Q+0Aez9biDw2mGEdecGIFKbEYVzsl5r/0ZEZkKKEKyBcuMB1wC pQmiy8Y4Ih3KFWdGgs6f22KDIway5ho4SIm6ADpod03N8DsPQhZ2AA3syjeGvbraTQzlNQ xZi+23xm0rXE2Nzu2orgZYyLlK+2EbcGnVmzdACrBqVhgu75y/RVDPkjrRXuWzc8fuNBkC uE7n9ELf9MwcW/e/5w54yO+Wz/BnDhfXN/uU+oVwKwNTJ87klroQwZZkr5wZ8XARpINn/g rG5SmgI/Yic4e6JTEac89OU2PjVcAb2PDPKjfPlfaRKJXOrHV6DfKpIXgsB0AQ== 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=1715241361; 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=OQATEEKFSMEN7d2tBv2F9rkgmKMeIm5zhUAsb/H+soQ=; b=N1gqsPWrjNzyzhN4TXgMQoxVcSF+UlxlBcgTsQ84d3vBo6ZHXHjFEGfyVeOaP5z7YBaqiM x6fduc4sTq293UKWbVMlqGo+mcuaNdV5UAN3FtbKWASvGy5SECEU0xR1ERG3A19pOUyKL/ bgJMpX5uUpRJhfq1xtV0MfXVQMpYBi6ggP8X/CGuaj+1lGy1Vlh/tinm3+Iv6om3/TWECM syjobkmjkNO9OiG7Yg6a/LM3z8SuQU3aVSEjM9OEavnMONLG3VIvB3dJqjiOtE5Rm9lSpg RI4sWMiqFvR9X5pnKQ/0Qvqh2FFzdqsZvHG0j+yWsHyn8LQvVh/JNZoFN6rBAA== 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 4VZkpn0lrKz115Z; Thu, 9 May 2024 07:56:01 +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 4497u1t0091149; Thu, 9 May 2024 07:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4497u02u091146; Thu, 9 May 2024 07:56:00 GMT (envelope-from git) Date: Thu, 9 May 2024 07:56:00 GMT Message-Id: <202405090756.4497u02u091146@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: ce7756fdca1f - main - 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/main X-Git-Reftype: branch X-Git-Commit: ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb commit ce7756fdca1f0a89a74bc406cd3d3ac1d1be1ffb Author: Colin Percival AuthorDate: 2024-05-09 07:52:25 +0000 Commit: Colin Percival CommitDate: 2024-05-09 07:52:25 +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 --- release/Makefile.vm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1124680e3191..548b4c1cca3b 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"