From nobody Wed Oct 08 04:42:15 2025 X-Original-To: dev-commits-src-main@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 4chL2b4Gxlz6BFB3; Wed, 08 Oct 2025 04:42:15 +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 4chL2b3ZY8z41nM; Wed, 08 Oct 2025 04:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759898535; 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=Pk08CCFZdPMDCz+itfPBpFxFfxj9OKWfqzoaTQ941V4=; b=HPyju4sjwPk3fAm3aSyNU5v2ahhtlp83qiY9j+hjX/oyIFo6wVDx0XnqXH0NiE5g0SdGFS VqOAHl21MXPw546kj1ezjWyOiIi4NkBP6zoJgMZXrfe0wccu4UZWZUluK91skvg5heU+Qq 5GBXXeFR9vC2GtFsZGKaVCjuLKBZOYJQV3fCBRtMBne1MacT6NyVbjy3zE5odcbhHCykkE AqYeOAWihn+hLql3Wsm9LjUqonWXjZpMNbbI0Pg8wxOHD7x9S+FX6JZJ0xTGdgybQQXquT URaWz8DQHFCenL/DKBuWxZXTrs4Z5lOEjnOq4iX4eEmrNq82xHD/+yJYVvHU8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759898535; 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=Pk08CCFZdPMDCz+itfPBpFxFfxj9OKWfqzoaTQ941V4=; b=SHYyIOhZkaoKsCuQHGiVt2BH3apTOxfbp4uPydx/CA809SiqEbFP3uYxje6wtmQ0uPLsQs VhCWzEW0Vd7S0xJKpohZr6acPJqNLty1K95guPXJbHsQ2r9JctxsX4+RAj7RoaFvt+BjHX 2DlGGrGEE0h1nc0sa9wcBLAY5XooGWu1roIuMwGXIuUsYDTZOJgGoqhBjq6r5+zMm3thfO O8ehC0kbmdmcxRIY3HR4orNRo3hkPlWMnp7NP6T8x/08tztFTadoeMeZ8OMS4saX0hkJLa 9KGAKJY1t4t/Y7HI2KM/ct/KZKbdH1JN8ZB9gETNp/kJnLGh4AOSez2TGYnIiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759898535; a=rsa-sha256; cv=none; b=iK/tbXvDzyq97NUs6fQ9ce4KSPF9xdQNu7HcWqBzLxvoMKImzxmLbxmdV/ZkeNOEs8kNpF XzxfRf1+mAHxkb15hT3wklVPSpZMGfYPvlpTPb7cooEcNyMbHh/Kn9nioMsxjSuTXFZD5d UXj3hpy5gLJFu9zA/2GzXrJX4gasr8i3tpLgjByQm4T1zgGQArIW2FhkJDozgUlGZZWgbp qbUgIReL0uTgjTCpq5Ow3c2PV/pYnfGvI4ZiCKfL4n1paVP6Hj8NARfkg1YYJmIGwkOGiW wx3yptGnbyAyAaNtFv8CCVgGe59q/XCxWiw51lSntPy2kSC7e9Wvdy3uSwCgug== 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 4chL2b37hZz2Bw; Wed, 08 Oct 2025 04:42:15 +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 5984gFET071987; Wed, 8 Oct 2025 04:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5984gFDu071984; Wed, 8 Oct 2025 04:42:15 GMT (envelope-from git) Date: Wed, 8 Oct 2025 04:42:15 GMT Message-Id: <202510080442.5984gFDu071984@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: b6f69c39999b - main - release: Fix dependency ordering List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b6f69c39999bfb85af262363b4fe22edc80027d7 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b6f69c39999bfb85af262363b4fe22edc80027d7 commit b6f69c39999bfb85af262363b4fe22edc80027d7 Author: Colin Percival AuthorDate: 2025-10-07 20:48:06 +0000 Commit: Colin Percival CommitDate: 2025-10-08 04:42:10 +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 --- release/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 12f5114f8b22..13532097d56c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -448,9 +448,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