From nobody Fri Oct 10 17:38:05 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 4cjv8s5LC6z6BfQs; Fri, 10 Oct 2025 17:38:05 +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 4cjv8s4hytz3q8Y; Fri, 10 Oct 2025 17:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760117885; 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=L9/2lQ/v7vbIJF2dyOCN+EVktVrhWgvxvpsDbxnRLLY=; b=VpQGOapcEE4Qp+rdO7LqgeeDj/comxQntJSiTIOlhPSrLEkyODFLmtuD4AfzdUu/ET5PRW d6qmllYFdEzuu8Spys/+YNGElLFZCc0EmJVOVdacO19+llOBLdFe5iBbOkaooRQBb5fjcO vNnYcxenWitWZF9bmj/hYRIkpJvZ8kJoriBU6r8fgdl1srSYQBLM48gIa39xoyIU4eMt9E WMJmEzjNzG46mAl1mLOiTogFNfdjJMkEkvBx4fpw2pjGrVIEYaMCo2D5f6HMvvQ30N+JEQ yuK69bsSrQD/p+Shmb7Rwj6146ZiXHEutbyZKJHq4oFSp03crXlQp0V+/PMClw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760117885; 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=L9/2lQ/v7vbIJF2dyOCN+EVktVrhWgvxvpsDbxnRLLY=; b=t0auCHPvn6sYj1pOOawwCWp71Qto1oNF+dFGAj9HZ5gcJUZZfvGJbUZT+hFe4V3wb6vrpR RDsJNc6P9UUix/PgFgr1Q8lDsjj8/xn+4IqT2Mo6IaAyVvoAwJRRjSPq5VYC6fysDhFNXf nlxYDcZ5YaMQPmRXe/H547Bgc4Nen20c1UAYselDH1icsLxRXzzb4W7q+PXk83pVb2WDJg NMc6Dbe2y01hNPQFb+uqYfn7x7VA9NOXAie0V1xu5dqUCiuB+hkqOwRUtBGQHWS81ljbas YknGXISugifZidWG/LTZVY3pyfY2cfConQY9qUSIcn4638YSF/bAKaPitxlWnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760117885; a=rsa-sha256; cv=none; b=hX5dsf3eTMQurXrAo3OqBeHpSDjUu4AuyyTQhDNM6IyUGOWAgiZpEUuQi/ATqelUbf0vX/ D5UfUf4Fx2DUQxZlnIaW/vAdud/+/7wHhlfg4tETUuhI67HVI6WYifvgJOsW+0RFfo4IEO lakfN0w2w8jmbJX8O+82ootYVVrtmHGNuM3b+1aS5fdWHbadBtVN3aCq8waLA+lCS55s99 OsnAG+F5Fe4oQgRBE8n1RWSamSVi5CV4SdIfi0gzBe/dMRS9L5FWLGELFGpK3fpfpo6WVA WmozwoBRs2FEsrtFRgmantU7Z2bmQSFjOJcgm93hDHyfwfnM0PpdvXoN87qkAw== 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 4cjv8s3djHz1CMX; Fri, 10 Oct 2025 17:38:05 +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 59AHc5OY047457; Fri, 10 Oct 2025 17:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AHc5FQ047454; Fri, 10 Oct 2025 17:38:05 GMT (envelope-from git) Date: Fri, 10 Oct 2025 17:38:05 GMT Message-Id: <202510101738.59AHc5FQ047454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: a29cf898b09c - main - 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/main X-Git-Reftype: branch X-Git-Commit: a29cf898b09c4d4906f92fd2982410c9f5935f6c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a29cf898b09c4d4906f92fd2982410c9f5935f6c commit a29cf898b09c4d4906f92fd2982410c9f5935f6c Author: Kyle Evans AuthorDate: 2025-10-10 17:37:51 +0000 Commit: Kyle Evans CommitDate: 2025-10-10 17:37:51 +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. MFC after: 37 seconds (pkgbase fix for 15.0 builds) Reviewed and tested by: cperciva Differential Revision: https://reviews.freebsd.org/D53017 --- Makefile.inc1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9dc4f2db4a6c..74c4598dd092 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2240,7 +2240,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" \ @@ -2265,9 +2265,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 | \