Author: emaste
Date: Thu Apr 21 19:24:36 2016
New Revision: 298429
URL: https://svnweb.freebsd.org/changeset/base/298429
Log:
Fix compiled-in keymap generation for sc/vt consoles
In r298297 kbdcontrol's -P <path> option was MFC'd to stable/10, which
enables this change for a simplified compile-time default keymap build
process.
PR: 193865
MFC of: r296899, r296914, r297363, r298402
Modified:
stable/10/Makefile.inc1
stable/10/sys/conf/files.amd64
stable/10/sys/conf/files.i386
stable/10/sys/conf/files.pc98
stable/10/sys/conf/files.sparc64
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Thu Apr 21 18:58:06 2016 (r298428)
+++ stable/10/Makefile.inc1 Thu Apr 21 19:24:36 2016 (r298429)
@@ -1321,6 +1321,12 @@ _cat= bin/cat
_awk= usr.bin/awk
.endif
+# r296926 -P keymap search path, MFC to stable/10 in r298297
+.if ${BOOTSTRAPPING} < 1003501 || \
+ (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)
+_kbdcontrol= usr.sbin/kbdcontrol
+.endif
+
.if ${MK_BSNMP} != "no"
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
@@ -1391,6 +1397,7 @@ bootstrap-tools: .PHONY
${_dtc} \
${_awk} \
${_cat} \
+ ${_kbdcontrol} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
Modified: stable/10/sys/conf/files.amd64
==============================================================================
--- stable/10/sys/conf/files.amd64 Thu Apr 21 18:58:06 2016
(r298428)
+++ stable/10/sys/conf/files.amd64 Thu Apr 21 19:24:36 2016
(r298429)
@@ -50,12 +50,12 @@ font.h optional
sc_dflt_font \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
#
atkbdmap.h optional atkbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e
's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static
accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"
\
+ compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P
${S:S/sys$/share/}/syscons/keymaps -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static
keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* =
/static accentmap_t accent_map = /' > atkbdmap.h" \
no-obj no-implicit-rule before-depend \
clean "atkbdmap.h"
#
ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -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"
\
+ 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"
#
Modified: stable/10/sys/conf/files.i386
==============================================================================
--- stable/10/sys/conf/files.i386 Thu Apr 21 18:58:06 2016
(r298428)
+++ stable/10/sys/conf/files.i386 Thu Apr 21 19:24:36 2016
(r298429)
@@ -49,12 +49,12 @@ font.h optional
sc_dflt_font \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
#
atkbdmap.h optional atkbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e
's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static
accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"
\
+ compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P
${S:S/sys$/share/}/syscons/keymaps -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static
keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* =
/static accentmap_t accent_map = /' > atkbdmap.h" \
no-obj no-implicit-rule before-depend \
clean "atkbdmap.h"
#
ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -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"
\
+ 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"
#
Modified: stable/10/sys/conf/files.pc98
==============================================================================
--- stable/10/sys/conf/files.pc98 Thu Apr 21 18:58:06 2016
(r298428)
+++ stable/10/sys/conf/files.pc98 Thu Apr 21 19:24:36 2016
(r298429)
@@ -46,7 +46,7 @@ svr4_assym.h optional compat_svr4
\
clean "svr4_assym.h"
#
ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -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"
\
+ 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"
#
Modified: stable/10/sys/conf/files.sparc64
==============================================================================
--- stable/10/sys/conf/files.sparc64 Thu Apr 21 18:58:06 2016
(r298428)
+++ stable/10/sys/conf/files.sparc64 Thu Apr 21 19:24:36 2016
(r298429)
@@ -8,17 +8,17 @@
# dependency lines other than the first are silently ignored.
#
atkbdmap.h optional atkbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e
's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static
accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"
\
+ compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P
${S:S/sys$/share/}/syscons/keymaps -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static
keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* =
/static accentmap_t accent_map = /' > atkbdmap.h" \
no-obj no-implicit-rule before-depend \
clean "atkbdmap.h"
#
sunkbdmap.h optional sunkbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${SUNKBD_DFLT_KEYMAP} | sed -e
's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static
accentmap_t.* = /static accentmap_t accent_map = /' > sunkbdmap.h"
\
+ compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P
${S:S/sys$/share/}/syscons/keymaps -L ${SUNKBD_DFLT_KEYMAP} | sed -e 's/^static
keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* =
/static accentmap_t accent_map = /' > sunkbdmap.h" \
no-obj no-implicit-rule before-depend \
clean "sunkbdmap.h"
#
ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -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"
\
+ 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"
#
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
