aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-01-27 21:10:03 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-01-27 21:10:03 +0000
commit3d98f473dcef044a211c9f4b6cd2dbe807487f7c (patch)
treed765ad7427a93d14cc79ceb64cbc0f1c6ebf094e /release
parent0e186c0aabaaac56c546a9d8d5955f72971a02ab (diff)
downloadsrc-3d98f473dcef044a211c9f4b6cd2dbe807487f7c.tar.gz
src-3d98f473dcef044a211c9f4b6cd2dbe807487f7c.zip
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
Notes
Notes: svn path=/projects/release-pkg/; revision=294942
Diffstat (limited to 'release')
-rw-r--r--release/scripts/mtree-to-plist.awk22
1 files changed, 20 insertions, 2 deletions
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index 9aa172b79ddc..a60a62416741 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
}