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
This commit is contained in:
parent
2596eb8847
commit
c016c89196
@ -93,7 +93,7 @@ distribution:
|
|||||||
.if ${MK_BOOT} != "no"
|
.if ${MK_BOOT} != "no"
|
||||||
.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
|
.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
|
||||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||||
-T "package=runtime" \
|
-T "package=bootloader,config" \
|
||||||
${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
|
${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
|
||||||
${DESTDIR}/boot/device.hints
|
${DESTDIR}/boot/device.hints
|
||||||
.endif
|
.endif
|
||||||
|
@ -28,9 +28,6 @@
|
|||||||
tags=tags""_kernconf
|
tags=tags""_kernconf
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($1 ~ /^\/boot\//) {
|
|
||||||
tags="package=bootloader"
|
|
||||||
}
|
|
||||||
if (length(tags) == 0)
|
if (length(tags) == 0)
|
||||||
next
|
next
|
||||||
if (tags ~ /package=/) {
|
if (tags ~ /package=/) {
|
||||||
@ -39,6 +36,8 @@
|
|||||||
for (i in a) {
|
for (i in a) {
|
||||||
if (a[i] ~ /^package=/) {
|
if (a[i] ~ /^package=/) {
|
||||||
pkgname=a[i]
|
pkgname=a[i]
|
||||||
|
if ($1 ~ /^\/boot\//)
|
||||||
|
pkgname="bootloader"
|
||||||
gsub(/package=/, "", pkgname)
|
gsub(/package=/, "", pkgname)
|
||||||
} else if (a[i] == "config") {
|
} else if (a[i] == "config") {
|
||||||
type="config"
|
type="config"
|
||||||
|
Loading…
Reference in New Issue
Block a user