Add 'stagekernel' target, which invokes 'distributekernel'

with -DNO_ROOT to create the METALOG mtree(8) file.

Separate the default STAGEDIR for world (WSTAGEDIR) and kernel
(KSTAGEDIR).

Fix the 'create-kernel-packages' target to work properly.

Evaluate if 'kernel' is set when invoking mtree-to-plist.awk,
which splits the kernel and kernel.debug into separate plist
files.

Fix METALOG creation when building/packaging multiple kernels.

Sponsored by:	The FreeBSD Foundation

1 files changed, 20 insertions, 2 deletions

diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index 9aa172b..a60a624 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -22,6 +22,12 @@
 			type="dir"
 		}
 	}
+	if (kernel != "") {
+		tags="package=kernel"
+		if (_kernconf != "") {
+			tags=tags""_kernconf
+		}
+	}
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
@@ -57,10 +63,22 @@
 			}
 		}
 	} else {
-		print "No packages specified in line: $0" > 2
+		print "No packages specified in line: $0"
 		next
 	}
-	output=pkgname".plist"
+	if (kernel != "") {
+		output="kernel"
+		if (_kernconf != "") {
+			output=output"."_kernconf
+		}
+		if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
+			output=output"-debug.plist"
+		} else {
+			output=output"-release.plist"
+		}
+	} else {
+		output=pkgname".plist"
+	}
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }