Author: imp
Date: Mon Aug 12 23:25:14 2019
New Revision: 350966
URL: https://svnweb.freebsd.org/changeset/base/350966
Log:
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.
Modified:
head/sys/arm64/conf/NOTES
head/sys/conf/files
head/sys/conf/files.amd64
head/sys/conf/files.arm
head/sys/conf/files.i386
head/sys/conf/files.sparc64
Modified: head/sys/arm64/conf/NOTES
==============================================================================
--- head/sys/arm64/conf/NOTES Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/arm64/conf/NOTES Mon Aug 12 23:25:14 2019 (r350966)
@@ -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
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/conf/files Mon Aug 12 23:25:14 2019 (r350966)
@@ -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" \
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/conf/files.amd64 Mon Aug 12 23:25:14 2019 (r350966)
@@ -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" \
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/conf/files.arm Mon Aug 12 23:25:14 2019 (r350966)
@@ -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
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/conf/files.i386 Mon Aug 12 23:25:14 2019 (r350966)
@@ -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" \
Modified: head/sys/conf/files.sparc64
==============================================================================
--- head/sys/conf/files.sparc64 Mon Aug 12 22:58:56 2019 (r350965)
+++ head/sys/conf/files.sparc64 Mon Aug 12 23:25:14 2019 (r350966)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
