From c016c891966a63fd5992515c130823ae01af208c Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Tue, 24 Mar 2020 01:07:01 +0000
Subject: [PATCH] pkgbase: Move device.hints from the runtime to the bootloader
 package

Also mark it as config file so if a user changes this file pkg will attempt
to merge the new file upon an update.
device.hints is neither related to runtime or loader but it make more sense
to have it in loader in case some user delete /boot/ and wants to recreate it,
now only two packages are required FreeBSD-bootloader and the kernel package.
While here change where we override the package for files installed in /boot,
this allow us to keep other tags (such as config).

Reported by:	pizzamig
Reviewed by:	bapt pizzamig emaste
Differential Revision:	https://reviews.freebsd.org/D24159
---
 etc/Makefile                       | 2 +-
 release/scripts/mtree-to-plist.awk | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index dbb53309dca6..683523ff15fc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -93,7 +93,7 @@ distribution:
 .if ${MK_BOOT} != "no"
 .if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    -T "package=runtime" \
+	    -T "package=bootloader,config" \
 	    ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
 	    ${DESTDIR}/boot/device.hints
 .endif
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index e43519a64364..a5065dd55fb2 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -28,9 +28,6 @@
 			tags=tags""_kernconf
 		}
 	}
-	if ($1 ~ /^\/boot\//) {
-		tags="package=bootloader"
-	}
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
@@ -39,6 +36,8 @@
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
 				pkgname=a[i]
+				if ($1 ~ /^\/boot\//)
+					pkgname="bootloader"
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"