aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2020-03-24 01:07:01 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2020-03-24 01:07:01 +0000
commitc016c891966a63fd5992515c130823ae01af208c (patch)
tree8937baf22c073e47719ce4a0d06a215be2aec952 /release/scripts
parent2596eb88477d4a1847f50aaf9f487a1b3c26429d (diff)
downloadsrc-c016c891966a63fd5992515c130823ae01af208c.tar.gz
src-c016c891966a63fd5992515c130823ae01af208c.zip
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
Notes
Notes: svn path=/head/; revision=359265
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/mtree-to-plist.awk5
1 files changed, 2 insertions, 3 deletions
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"