diff options
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | release/scripts/mtree-to-plist.awk | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index dbb53309dca69..683523ff15fc3 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 e43519a643648..a5065dd55fb22 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" |