From nobody Thu Oct 30 12:34:50 2025 X-Original-To: dev-commits-src-branches@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 4cy3Tl1fxgz6Fbxc; Thu, 30 Oct 2025 12:34:51 +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 4cy3Tl0xjtz3CGc; Thu, 30 Oct 2025 12:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827691; 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=fCpPuKO/T4tg2RspT1nX/CpHjRatrxdV1ThQt/Z6eaQ=; b=TGmoFg8hGcJxoJfW42OsQCXB10J49s+kTk7dmYOSqIkiFpH62ZF1xiT69WL1e06LTd7ZIn 6f9pu4AB8YYwGJHiV9EHDWygL6IAuX+pOdPVN6zvyBfR+txrgmijZ6ihkr36FMZDdWJPVo csDruhfKtSLx8Gr7aX6j0251Yabg4hELzAIkihS8ZQJK7nY6OZLgTG+RPDkIBbInnbVp2p ciEMFtx21cMmmL2lSDyimlU0KtbeBDer6GHB+tSSJmzuJhfbEMEpo9Xi/lNFjsXbknCpby WNCJ0apoWOccrCclHEg/fLkV3+gFuo38DjRkpbX/S67NSjNPychVBzZBROaWkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827691; 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=fCpPuKO/T4tg2RspT1nX/CpHjRatrxdV1ThQt/Z6eaQ=; b=PAcAMQPtHy3R3yx62RRvsnao9cJpdbjbuI8MLjLYLaUaXDCoENXHx08+y9V3BaTS9Pv3DR 6n04q2X1EHBF9nlg78OD6E/263C3pUjJO74+Ad02vXu7KF/lKqNe/3sfsNzP4niqMix7Iy df1VJAmGJa6+AcjDqRsZOJTCxX7FhSfWDoB6Br27vpCQr04KJljGpAdx9G6o/2HR/8HA+Z qUpWKcLT9EX44H0bxsq823UBky6h3E3nyZ+OHmsX8bnLwUgc+pZjBz02edZvOHZDbapLO7 u6hN3gykORgRgqpqu4PIQwqFy7xE3xXWQVvWNQDEhNxKnU80IqMHOBT86JGxPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761827691; a=rsa-sha256; cv=none; b=aPsGOExv+MtKIlTtl7QYm7wUXJ0RtMdSqXt31aM8l0EjVqJ+dVceJvMpoK4TRP+MUCnC6v JucW2DySN9L/QNJI2GwcNRqUqPMjCoBNN/L4AWxwA4RdyLotTjM2kj8tgdO2Vty2Tqehyj GuJ/GmRcEqbXXHZaUgzUbfKmvuvauI58fX6FR513rW+mUtTeOd7K0bugtf5P84Ws+9sSzq m3aodcKqILncxWwttwbOMfR2i7qxdji/h1ZXGtqnLf1E/rfFtSY4VXQmXsyo+OXG5lN1SF k1Fp82h/TVWIhNtIXv9pu0j7995u0SDefVFu03Gxj1QPgNE8hJ4anUmW4u854w== 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 4cy3Tl0BPHz7XM; Thu, 30 Oct 2025 12:34:51 +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 59UCYomP006146; Thu, 30 Oct 2025 12:34:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UCYoge006143; Thu, 30 Oct 2025 12:34:50 GMT (envelope-from git) Date: Thu, 30 Oct 2025 12:34:50 GMT Message-Id: <202510301234.59UCYoge006143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a182020edf39 - stable/15 - packages: Remove the /boot hack from mtree-to-plist.awk List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a182020edf39b8658f7f708141ff6ee47b36102c Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a182020edf39b8658f7f708141ff6ee47b36102c commit a182020edf39b8658f7f708141ff6ee47b36102c Author: Lexi Winter AuthorDate: 2025-10-25 17:18:46 +0000 Commit: Lexi Winter CommitDate: 2025-10-30 12:34:28 +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. 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) --- 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