From 33550b47391330362ea58984aa3fd691f6219ee0 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 1 Mar 2022 22:54:45 -0700 Subject: [PATCH] bootstrap: No need for kbdcontrol bootstrap anymore We only need kbdcontrol when bootstrapping from FreeBSD 10 or pre-FreeBSD 11.0 current. Since we can no longer build from these versions of FreeBSD, remove the support for bootstrapping them. Sponsored by: Netflix --- Makefile.inc1 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b7aff83a31d..5d060f9f6d6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2305,18 +2305,6 @@ _crunchgen= usr.sbin/crunch/crunchgen _bootstrap_tools_links+=crunchgen .endif -# r296926 -P keymap search path, MFC to stable/10 in r298297 -# Note: kbdcontrol can not be bootstrapped on non-FreeBSD systems -.if !defined(CROSSBUILD_HOST) -.if (${BOOTSTRAPPING} < 1003501 || \ - (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) || \ - (!exists(/usr/sbin/kbdcontrol))) -_kbdcontrol= usr.sbin/kbdcontrol -.else -_bootstrap_tools_links+=kbdcontrol -.endif -.endif - # 1300102: VHDX support .if ${BOOTSTRAPPING} < 1201520 || \ (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102)