From 7442cdca51fac3416cd6e2d1944158add17e65de Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 14 Jul 2025 11:00:10 -0400
Subject: [PATCH] i386: Unhook all kernel configs from make universe

This effectively makes i386 a world-only target in make universe.

Reviewed by:	bz, imp
Differential Revision:	https://reviews.freebsd.org/D51193
---
 sys/i386/conf/GENERIC         | 2 ++
 sys/i386/conf/GENERIC-NODEBUG | 2 ++
 sys/i386/conf/LINT            | 1 +
 sys/i386/conf/MINIMAL         | 2 ++
 sys/i386/conf/PAE             | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index e7d460af21d..f577cd07ac7 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -17,6 +17,8 @@
 # in NOTES.
 #
 
+#NO_UNIVERSE
+
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG
index ea07613a796..a93304481b5 100644
--- a/sys/i386/conf/GENERIC-NODEBUG
+++ b/sys/i386/conf/GENERIC-NODEBUG
@@ -25,6 +25,8 @@
 # in NOTES.
 #
 
+#NO_UNIVERSE
+
 include GENERIC
 include "std.nodebug"
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 41207eb63cb..2e947202f72 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1,3 +1,4 @@
+#NO_UNIVERSE
 
 include "../../conf/NOTES"
 include "../../x86/conf/NOTES"
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 2a06eb84bff..8019617ca4d 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -31,6 +31,8 @@
 # in NOTES.
 #
 
+#NO_UNIVERSE
+
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index a39d32d7710..72af9e9a9ee 100644
--- a/sys/i386/conf/PAE
+++ b/sys/i386/conf/PAE
@@ -2,6 +2,8 @@
 # PAE -- Generic kernel configuration file for FreeBSD/i386 PAE
 #
 
+#NO_UNIVERSE
+
 include GENERIC
 
 ident		PAE-GENERIC