From nobody Fri Oct 10 04:46:54 2025 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 4cjZ332WQDz6BGj7; Fri, 10 Oct 2025 04:46:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjZ330C6Cz3D2C; Fri, 10 Oct 2025 04:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071615; 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=iN8n6K/RlVvsDp+DcsuZ0GdYbkO45G+mGQjlDZFNQPo=; b=Ccrpb6dKW6wYDaztf/mhFsoszDJcWW+69thGucA+N5CeLBCZg4aFufMzwmR7K2FUIWQV+M BhJJqmaJKNF4R0VQA4PZkkJNQGCCOisffOsMzif/xUDkCr7EL6x7w8qXFfhJRz6m7db1f1 FZYzMgXZAoV6sDigpUeERntsQCyGimiiZ+BUx1jSHm0NgVC1Y+k+1yG99eYXym72481TiY Emv0nsKSJkMtHFFObJssK8/Dd3CcNeWOeM4Ke2cmMQiUJlCg1dO0laHAAlufz9dJjaQovS 7aSmnZLBiS4WLuDaFd7qSIVUcwULkjGsie6+ccd98dMKI6Lie18ftXX3qmJ/gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071615; 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=iN8n6K/RlVvsDp+DcsuZ0GdYbkO45G+mGQjlDZFNQPo=; b=gUWBxgiLe8fl6W25o532DqDMZI4KuwlTJKq5XU2AFJpwWHjMY1B1nsc7IQ2U/Erw1gGVcn CFgMlEC8mwrlH6dPAroyWHWzWUJCcc5BxTjMYv3+v/MWhO/xNJI7JhXi1kifJFi9G25z7f q127UOC0VzQfFD8phSc+nyHPk//Gyze2y9HevRw+2PF1iUTdzRDhVUQ4QWBtMV4v+k2Tvx TV+CoXrapIw3tC/R3/7jAfoirmtL7x59UyNNaShqIryjamILUda3pSEMpO07B36N6wtn56 ltxystZRmA7s4LcllnqK/TwiYjQdTbK8uL4r5/q9KOQEb+ilBcJhouMtQSH/Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760071615; a=rsa-sha256; cv=none; b=N4p/lmo9HFMCief+GEQopdIdVeSpg3GOg43wGCZRHs+YP+3zznJcXRKgH2u2pCHfkH+/P6 QFcoYXf1fbeH7i0gw3bYOWixRISkcY52+T4VrTPuKms0jlhwsBuB44KanZ1ZKVvCmUkOCP 07A4blnndFtrODaE8jWVvZjXj+1DoQ+DoKS62FrmoxSaE1fqFN7RmAG5KYHdwG3KquPchs OwYhl33beh+WfsryiERWtkqpnMP9Pv9FwnS5TtDKF/OGBruo1RdtFvdaOq6q0CKhmWVBK2 8RXHRvAeIeIds2cZGzwT6cR8smDeZ6eVVkxeSQYnW3d756dLAP/C7w7BaTkUtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjZ3262wGzpLG; Fri, 10 Oct 2025 04:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59A4ksDc098230; Fri, 10 Oct 2025 04:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A4kslK098227; Fri, 10 Oct 2025 04:46:54 GMT (envelope-from git) Date: Fri, 10 Oct 2025 04:46:54 GMT Message-Id: <202510100446.59A4kslK098227@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: 4f00e2f96546 - stable/15 - release: Fix dependency ordering 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/15 X-Git-Reftype: branch X-Git-Commit: 4f00e2f965464eb4eb0814f6a64d21b9baf12745 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4f00e2f965464eb4eb0814f6a64d21b9baf12745 commit 4f00e2f965464eb4eb0814f6a64d21b9baf12745 Author: Colin Percival AuthorDate: 2025-10-07 20:48:06 +0000 Commit: Colin Percival CommitDate: 2025-10-10 04:46:43 +0000 release: Fix dependency ordering The 'make release' command triggers some sub-builds, in particular 'real-release' (which builds install images) and 'vm-release' (which builds VM images). These both now depend on pkgbase-repo. Unfortunately for historical reasons 'make real-release' has used a recursive make instead of proper make dependencies; this results in the pkgbase-repo target being invoked twice since the recursive make does not have any awareness of the targets being run by the parent make command. Since the pkgbase-repo target starts by creating the pkgbase-repo directory, the second make command incorrectly assumes that target has already been built; this showed up in 15.0-ALPHA5 builds with pkgbase-repo.tar being empty as it was created after the pkgbase-repo directory was created by before that directory had been populated. Change real-release: make obj make ${RELEASE_TARGETS} to a single line real-release: obj .WAIT ${RELEASE_TARGETS} in order to handle dependency deduplication properly while keeping the intended behaviour that "obj" completes before ${RELEASE_TARGETS}. Diagnosed by: jrtc27, emaste Reviewed by: emaste MFC after: 1 day Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52972 (cherry picked from commit b6f69c39999bfb85af262363b4fe22edc80027d7) --- release/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 6bcb651d8dba..6b5b0c1b975c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -445,9 +445,7 @@ release: real-release vm-release cloudware-release oci-release release-done: touch release -real-release: - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} +real-release: obj .WAIT ${RELEASE_TARGETS} install: release-install vm-install oci-install .WAIT cloud-install