From 09813007a50b840e08bc569f5f9d3322ed952252 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 12 Aug 2019 23:25:14 +0000
Subject: [PATCH] ukbdmap.h rule was identical on all platforms, so move them
 into sys/conf/files.

This allows us to remove 'nodevice ukbd' from the arm64 NOTES file.
---
 sys/arm64/conf/NOTES   | 1 -
 sys/conf/files         | 4 ++++
 sys/conf/files.amd64   | 5 -----
 sys/conf/files.arm     | 6 ------
 sys/conf/files.i386    | 5 -----
 sys/conf/files.sparc64 | 5 -----
 6 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index b206b0447987..075bcb280bb9 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -209,7 +209,6 @@ options		MMCCAM
 nooptions 	PPC_PROBE_CHIPSET
 
 # These cause weird issues, not sure why
-nodevice	ukbd
 nooptions 	DEBUG
 
 # Makes assumptions about bus tags that aren't true on arm64
diff --git a/sys/conf/files b/sys/conf/files
index 6d8a437cd424..96965db3e5dc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -58,6 +58,10 @@ teken_state.h		optional sc | vt				   \
 	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
+ukbdmap.h			optional	ukbd_dflt_keymap	\
+	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
+	no-obj no-implicit-rule before-depend				\
+	clean		"ukbdmap.h"
 usbdevs.h			optional usb				   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4eba1f33d27f..67a1e44f44eb 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -82,11 +82,6 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
 hpt27xx_lib.o			optional	hpt27xx			\
 	dependency	"$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu"	\
 	compile-with	"uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 8d890144b277..6134b20e1177 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -166,12 +166,6 @@ cloudabi32_vdso_blob.o		optional	compat_cloudabi32	\
 	clean		"cloudabi32_vdso_blob.o"
 #
 
-#
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-
 # Annapurna support
 arm/annapurna/alpine/alpine_ccu.c		optional al_ccu fdt
 arm/annapurna/alpine/alpine_nb_service.c	optional al_nb_service fdt
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 7f7a7bb4a706..2214b9404889 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -57,11 +57,6 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
 hpt27xx_lib.o			optional	hpt27xx			\
 	dependency	"$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu"	\
 	compile-with	"uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 5c2a260a14f0..64e71b469fe4 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -17,11 +17,6 @@ sunkbdmap.h			optional	sunkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"sunkbdmap.h"
 #
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
 cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S	optional zfs compile-with "${ZFS_S}"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec | ipsec_support
 crypto/des/des_enc.c		optional	crypto | ipsec | ipsec_support | netsmb