From 9bbe06b004e2cadb55a3792c77991ee640bf0f52 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Fri, 2 Feb 2024 11:39:51 +0100
Subject: Revert "pkgbase: Create a FreeBSD-dtb package"

Somehow this doesn't work iwth make packages due to some kind of a race.
The package is first created correctly but later in the process it is
overwritten by a badly created empty package.
Revert in the mean time so we can have working pkgbase on arm/arm64

This reverts commit a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e.
---
 release/packages/dtb.ucl           | 16 ----------------
 release/scripts/mtree-to-plist.awk | 20 ++++++--------------
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 release/packages/dtb.ucl

(limited to 'release')

diff --git a/release/packages/dtb.ucl b/release/packages/dtb.ucl
deleted file mode 100644
index e4717b9054a2..000000000000
--- a/release/packages/dtb.ucl
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#
-
-name = "%PKG_NAME_PREFIX%-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT%"
-categories = [ base ]
-maintainer = "%PKG_MAINTAINER%"
-www = "%PKG_WWW%"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index e51f3c8bfe1a..7fcac9b92a81 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -23,13 +23,9 @@
 		}
 	}
 	if (kernel != "") {
-		if ($1 ~ /^\/boot\/dtb\//) {
-			tags="package=dtb"
-		} else {
-			tags="package=kernel"
-			if (_kernconf != "") {
-				tags=tags""_kernconf
-			}
+		tags="package=kernel"
+		if (_kernconf != "") {
+			tags=tags""_kernconf
 		}
 	}
 	if (length(tags) == 0)
@@ -40,12 +36,8 @@
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
 				pkgname=a[i]
-				if ($1 ~ /^\/boot\//) {
-					if ($1 ~ /^\/boot\/dtb\//)
-						pkgname="dtb"
-					else
-						pkgname="bootloader"
-				}
+				if ($1 ~ /^\/boot\//)
+					pkgname="bootloader"
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
@@ -72,7 +64,7 @@
 		print "No packages specified in line: $0"
 		next
 	}
-	if (kernel != "" && pkgname != "dtb") {
+	if (kernel != "") {
 		output="kernel"
 		if (_kernconf != "") {
 			output=output"."_kernconf
-- 
cgit v1.2.3