From nobody Fri Oct 10 17:38:58 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 4cjv9t2cP2z6BfMT; Fri, 10 Oct 2025 17:38:58 +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 4cjv9t27Khz3qJL; Fri, 10 Oct 2025 17:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760117938; 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=a8zQeBc3OoCgX7lxU8hCtpAMSw4mXt9ll1zTbxZc/U8=; b=Q4UK6vjpJOP7FP17bq8gJG26QtEEsAJmL3sq+QnBcThGXKvhvOV9b/1bERINFopm8KxmYf Uusc0+lT6gI0K5Vo42gcLjPkzj0wTGjZTbkqKUVcR4xo7QyaECVk/lBKXDnAAoctdIMN6w tvhrHOu612LqR6j7U8Bboz63gR42beNzrE6NFO903ZBQxSwabam+upuaNs1XSK7TdUK+Ns 9G/YiM6YG1rkwrZchRqOCRtxWBFzV65gFlA2D+JKgU7CMPDzW+zgSbop5hYOEhd58CJVpS 0NEDC/y3ox8sYp+JTegcx9J/gy+TVJXdPdBM3wyyAM/QI3T8vuApiG/hv/X0AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760117938; 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=a8zQeBc3OoCgX7lxU8hCtpAMSw4mXt9ll1zTbxZc/U8=; b=wW3k/MsK2A7/fPUI/klBGYXqkUtePUe/6juR9k7ZtPc5cApknvFlJKbuIpCtfAgBPCtDpT IeVDdftc4jjL42BKZKrIjH3ySImjgw6K7fQbWJisXYSwRCLcTGP0CssSoFxkEKkuXRBpn6 vqWDNHObF9u1rQpeE2cf1Q76IBKhl0fc6iNR07Ewwl0iTz+zYQI1mNmrlBRr6FWgYJIbue W/DKr0SC4eThsPqFfVH0L/qImK/okbzoMJyT7r07QDOWky72FnDzHdz7Ek3tvud49rnXlP qXVlW+9Is549V7xp3LljNYKSuW3e8MkTsR9UyeGc98urr/dNpJI6QlrKotCfDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760117938; a=rsa-sha256; cv=none; b=urqyldFGXK/Rk7y9xW40F60M0KaAK0GX+34rfEXB4yhCe3vCqPyJOV+LGucJmxfYxp1QT2 sYYSkC8gisGDq/lp1V8gCV8PGcyUtiv+U7dZCj1HyinuxZ4XtkMW7elthPTObrqoM7Ev2K p/YLb9UeZr1wyYpj9iDTI8vRl7C8Xt2f8PGO30hCIaEpO+y3GkPfHgGcJzHbg6NKfwI+Iy pgq6bkrwMO2p15+ucF0ce1DygnhlV3WxtRjX7V08vccawxc6VdUMTPBT55z4OlY1Bz497s bIVpl9B+8GN3/alUtZnA3PCe/lqGPh3DHcMp51QjwA6S0/qcmNpeFimwfw2Lgw== 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 4cjv9t1ggxz1BXZ; Fri, 10 Oct 2025 17:38:58 +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 59AHcwXH047826; Fri, 10 Oct 2025 17:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AHcwKc047823; Fri, 10 Oct 2025 17:38:58 GMT (envelope-from git) Date: Fri, 10 Oct 2025 17:38:58 GMT Message-Id: <202510101738.59AHcwKc047823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8a0cdfc5a58d - stable/15 - build: fix ordering of pkgbase targets to get a dtb package reliably 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8a0cdfc5a58d75272ec98a14c9cc7469db6b51f0 Auto-Submitted: auto-generated The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0cdfc5a58d75272ec98a14c9cc7469db6b51f0 commit 8a0cdfc5a58d75272ec98a14c9cc7469db6b51f0 Author: Kyle Evans AuthorDate: 2025-10-10 17:37:51 +0000 Commit: Kyle Evans CommitDate: 2025-10-10 17:38:25 +0000 build: fix ordering of pkgbase targets to get a dtb package reliably dtb.plist is generated by mtree-to-plist when it processes the kernel metalog, so we shouldn't try to create dtb packages until that's been done. Add another level of indirection to the create-kernel-packages target to organize all of the kernel flavors under a single target that is ordered before the create-dtb-packages target. Note that we may later refine these targets after further pkgbase review; this is simply a maybe-final stop-gap that's been tested to fix a known problem. Reviewed and tested by: cperciva (cherry picked from commit a29cf898b09c4d4906f92fd2982410c9f5935f6c) --- Makefile.inc1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e98b5f233b51..cd3e3f007c3b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2256,7 +2256,7 @@ _default_flavor= -default _debug=-dbg . endif -create-dtb-package: +create-dtb-package: .PHONY @if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \ ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "dtb" \ @@ -2281,9 +2281,12 @@ create-dtb-package: -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \ fi -create-kernel-packages: .PHONY +create-kernel-packages: .PHONY create-kernel-flavored-packages create-dtb-package +create-kernel-flavored-packages: .PHONY +.ORDER: create-kernel-flavored-packages create-dtb-package + . for flavor in "" ${_debug} -create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package +create-kernel-flavored-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \