D53179.id165041.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53179.id165041.diff
View Options

	diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
	--- 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
	--- 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
	--- 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
	--- 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