From a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sat, 27 Jan 2024 13:20:49 +0100 Subject: pkgbase: Create a FreeBSD-dtb package Before that dtbs where included in each kernel packages which prevents us to install multiple kernels. Differential Revision: https://reviews.freebsd.org/D43632 Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG --- release/scripts/mtree-to-plist.awk | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk index 7fcac9b92a81..e51f3c8bfe1a 100644 --- a/release/scripts/mtree-to-plist.awk +++ b/release/scripts/mtree-to-plist.awk @@ -23,9 +23,13 @@ } } if (kernel != "") { - tags="package=kernel" - if (_kernconf != "") { - tags=tags""_kernconf + if ($1 ~ /^\/boot\/dtb\//) { + tags="package=dtb" + } else { + tags="package=kernel" + if (_kernconf != "") { + tags=tags""_kernconf + } } } if (length(tags) == 0) @@ -36,8 +40,12 @@ for (i in a) { if (a[i] ~ /^package=/) { pkgname=a[i] - if ($1 ~ /^\/boot\//) - pkgname="bootloader" + if ($1 ~ /^\/boot\//) { + if ($1 ~ /^\/boot\/dtb\//) + pkgname="dtb" + else + pkgname="bootloader" + } gsub(/package=/, "", pkgname) } else if (a[i] == "config") { type="config" @@ -64,7 +72,7 @@ print "No packages specified in line: $0" next } - if (kernel != "") { + if (kernel != "" && pkgname != "dtb") { output="kernel" if (_kernconf != "") { output=output"."_kernconf -- cgit v1.3