Author: imp
Date: Sun Feb 2 08:27:20 2020
New Revision: 357400
URL: https://svnweb.freebsd.org/changeset/base/357400
Log:
Fix old-style build
Fix the old-style build by using ${SRCTOP} instead of a weird
construct that only works for new-style build.
Simplify the building of keymap files by using macros
Move atkbdmap.h in files.x86
This has been broken since r296899 which removed the implicit
dependency on /usr/share.
Modified:
head/sys/conf/files
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/files.x86
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sun Feb 2 08:27:14 2020 (r357399)
+++ head/sys/conf/files Sun Feb 2 08:27:20 2020 (r357400)
@@ -50,7 +50,7 @@ pccarddevs.h standard
\
no-obj no-implicit-rule before-depend \
clean "pccarddevs.h"
kbdmuxmap.h optional kbdmux_dflt_keymap \
- compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P
${S:S/sys$/share/}/syscons/keymaps -L ${KBDMUX_DFLT_KEYMAP} | sed -e 's/^static
keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* =
/static accentmap_t accent_map = /' > kbdmuxmap.h" \
+ compile-with "${KEYMAP} -L ${KBDMUX_DFLT_KEYMAP} | ${KEYMAP_FIX} >
${.TARGET}" \
no-obj no-implicit-rule before-depend \
clean "kbdmuxmap.h"
teken_state.h optional sc | vt \
@@ -59,7 +59,7 @@ teken_state.h optional sc | vt
\
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" \
+ compile-with "${KEYMAP} -L ${UKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} >
${.TARGET}" \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
usbdevs.h optional usb \
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Sun Feb 2 08:27:14 2020 (r357399)
+++ head/sys/conf/files.amd64 Sun Feb 2 08:27:20 2020 (r357400)
@@ -77,11 +77,6 @@ font.h optional
sc_dflt_font \
no-obj no-implicit-rule before-depend \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
#
-atkbdmap.h optional atkbd_dflt_keymap \
- 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"
-#
amd64/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi
\
dependency "$S/amd64/acpica/acpi_wakecode.S assym.inc" \
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Sun Feb 2 08:27:14 2020 (r357399)
+++ head/sys/conf/files.i386 Sun Feb 2 08:27:20 2020 (r357400)
@@ -52,11 +52,6 @@ font.h optional
sc_dflt_font \
no-obj no-implicit-rule before-depend \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
#
-atkbdmap.h optional atkbd_dflt_keymap \
- 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"
-#
cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
optional zfs | dtrace compile-with "${ZFS_S}"
cddl/dev/dtrace/i386/dtrace_asm.S optional dtrace
compile-with "${DTRACE_S}"
cddl/dev/dtrace/i386/dtrace_subr.c optional dtrace
compile-with "${DTRACE_C}"
Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86 Sun Feb 2 08:27:14 2020 (r357399)
+++ head/sys/conf/files.x86 Sun Feb 2 08:27:20 2020 (r357400)
@@ -12,6 +12,11 @@
# limitations in config: backslash-newline doesn't work in strings, and
# dependency lines other than the first are silently ignored.
+#
+atkbdmap.h optional atkbd_dflt_keymap \
+ compile-with "${KEYMAP} -L ${ATKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} >
${.TARGET}" \
+ no-obj no-implicit-rule before-depend \
+ clean "atkbdmap.h"
cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt |
dtraceall compile-with "${FBT_C}"
cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt |
dtraceall compile-with "${DTRACE_C}"
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Sun Feb 2 08:27:14 2020 (r357399)
+++ head/sys/conf/kern.pre.mk Sun Feb 2 08:27:20 2020 (r357400)
@@ -271,6 +271,9 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
SYSTEM_OBJS+= hack.pico
+KEYMAP=kbdcontrol -P ${SRCTOP}/share/vt/keymaps -P
${SRCTOP}/share/syscons/keymaps
+KEYMAP_FIX=sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e
's/^static accentmap_t.* = /static accentmap_t accent_map = /'
+
MD_ROOT_SIZE_CONFIGURED!= grep MD_ROOT_SIZE opt_md.h || true ; echo
.if ${MFS_IMAGE:Uno} != "no"
.if empty(MD_ROOT_SIZE_CONFIGURED)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
