From nobody Thu Oct 30 16:15:36 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 4cy8NT2vfpz6FCth; Thu, 30 Oct 2025 16:15:37 +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 4cy8NS1Y7Mz3wpP; Thu, 30 Oct 2025 16:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840936; 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=rQ3Vd6oWdZuPmwnwUTPgizArnLIbX4wO/wEUEfbTFkQ=; b=xEBlP7RWpowqpzyJAv++OaHMRLyGYeRHlNq36R0TRSpB9Ab9jXzxO9MRT6QwKOVJ1lFQGa R9vV0spHvsHqpG7Ib9XwH9Le8Rq+se30f7vis2UbPwaDpyuIq0KZ5/gYmDg8WJRfuZXofx Ji/l0He8E6qtDDm/ORIYXGYHKp5OKehLPt9z8rcljLwqJpnAQoS7xhQASPUTcCPZ6SSlrQ ZB+5gRTJ7JvPxH36B7GiwMOd3Cp7t1X6zn3QR2SEzOrv8/HIv/E+rk/EeyfZscLb59Zfrf Q7fc8pYMJa2Xp5rp5l3L2UkpyKaRRDW9vUvVnxQPfkrwzrcLfDKSLMCZ8hoT6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840936; 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=rQ3Vd6oWdZuPmwnwUTPgizArnLIbX4wO/wEUEfbTFkQ=; b=KjnA+bM1SK+tKlt4K1qPIKqnHFQb8Q06bkI43++AgXM4CocxqrOADbUp+C8wDg9s8xmWXh 68S2Jb6Rq7QPE91YG/o4xV69og8L+08dSbeej1qjdeWiVrg1r0hJUS0p7bodorws2yTxQx LvZmgQ7A67kZ/kk6kO0caFbr1difA4Hdwk6ARE1WJ7bjqgpTJ4PuFd1bSuSXaK4wy4p1ZI bmJIj1Fs2GfVS175vaWFVxcRmc1FG3bD7ZK90vBx0BWR85V0cdFnsWe1VBbu1YEGrOH28r OLcP3zcj4QxkNKRjeT9fr4bzv/empORA2o8mUtApd8zlyaqLdNbTgIGkwEevYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761840936; a=rsa-sha256; cv=none; b=oZ/NW6nQ4/UdiuEuWwvkaI5YhBMJ+K55LtCML0ORBQChlJt1DMqFibY5Z/CJsZRaZsLX2t 6pDJMguuaWjwFUvOjNlVQrilCvXuOt/XaWQ6U2ewAJIeuQjDJXSyDpTNxGrkYo2pZEJDLi m1GLdoBdtQ1kGVMxpkmOUY2z/3Qj/iis0J0hu5/Kuj7T6FqxTMSB6fP5UsR8Erqf4gvcCe saVZCEFDqKJqeMm2U4mMXA9WeRk7kLAAdcNTK+vIsa9IzuuZmVBgz7dKVixZOXDZ53hkjU q6cUYjI+3pf0e9bT2q2q99yEx7WJDEWiRmxhAaBtpbc8cXMIv7FYrACu922g+A== 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 4cy8NS0mVlzTkx; Thu, 30 Oct 2025 16:15:36 +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 59UGFaZ5023272; Thu, 30 Oct 2025 16:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UGFaB3023269; Thu, 30 Oct 2025 16:15:36 GMT (envelope-from git) Date: Thu, 30 Oct 2025 16:15:36 GMT Message-Id: <202510301615.59UGFaB3023269@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: a3cf750ba4fd - releng/15.0 - packages: Remove the /boot hack from mtree-to-plist.awk 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a3cf750ba4fdbc07c44e6da8d91a16d5ff8849b6 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a3cf750ba4fdbc07c44e6da8d91a16d5ff8849b6 commit a3cf750ba4fdbc07c44e6da8d91a16d5ff8849b6 Author: Lexi Winter AuthorDate: 2025-10-25 17:18:46 +0000 Commit: Colin Percival CommitDate: 2025-10-30 16:15:15 +0000 packages: Remove the /boot hack from mtree-to-plist.awk Currently, files in /boot (other than /boot/kernel) are assigned to the bootloader package using a filename match in mtree-to-plist.awk. This causes some problems, most notably that debug info for userboot ends up in the utilities-dbg package instead of bootloader-dbg. Remove the path handling from mtree-to-plist and instead set PACKAGE in the appropriate Makefiles to put these in the correct package. While here, move userboot*.so from bootloader-dev to bootloader. Approved by: re (cperciva) MFC after: 3 days Reviewed by: cperciva Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53179 (cherry picked from commit 842942be28b21354e3f547e39fc75bf18ee5b6f7) (cherry picked from commit a182020edf39b8658f7f708141ff6ee47b36102c) --- release/scripts/mtree-to-plist.awk | 6 ------ stand/Makefile.inc | 2 ++ stand/userboot/Makefile.inc | 4 ++++ sys/conf/dtb.mk | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk index a9f1e194389a..38c9963680ee 100644 --- a/release/scripts/mtree-to-plist.awk +++ b/release/scripts/mtree-to-plist.awk @@ -40,12 +40,6 @@ for (i in a) { if (a[i] ~ /^package=/) { pkgname=a[i] - if ($1 ~ /^\/boot\//) { - if (kernel != "" && $1 ~ /^\/boot\/dtb\//) - pkgname="dtb" - else if ($1 !~ /^\/boot\/firmware\//) - pkgname="bootloader" - } gsub(/package=/, "", pkgname) } else if (a[i] == "config") { type="config" diff --git a/stand/Makefile.inc b/stand/Makefile.inc index 5d55c4e4a16f..2866ebd20af3 100644 --- a/stand/Makefile.inc +++ b/stand/Makefile.inc @@ -1,5 +1,7 @@ SUBDIR_PARALLEL= yes +PACKAGE= bootloader + # Firmware may not be able to handle branch protection failures MK_BRANCH_PROTECTION= no diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc index 01b5f23410c8..392fd59a115f 100644 --- a/stand/userboot/Makefile.inc +++ b/stand/userboot/Makefile.inc @@ -1 +1,5 @@ .include "../Makefile.inc" + +# userboot.so should be installed in the base bootloader package, +# not bootloader-dev. +NO_DEV_PACKAGE= diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk index ec3df525d1e7..2050be7560a4 100644 --- a/sys/conf/dtb.mk +++ b/sys/conf/dtb.mk @@ -31,6 +31,8 @@ .include "dtb.build.mk" +PACKAGE?= dtb + .if !target(install) && !target(realinstall) all: ${DTB} ${DTBO} realinstall: _dtbinstall