diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-13 12:46:41 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-13 12:46:41 +0000 |
| commit | cf607e7adae64e868ad748f0bf9f44ff02495aec (patch) | |
| tree | 38054df221ef3a2149d936258b72222e60d7d302 /usr/src/uts/common/Makefile.files | |
| parent | 7d8f5232eba76666c623d07e4ae4401c00f43570 (diff) | |
| parent | c78b1a4529122c8f26c5b25b88f01dc4800751a0 (diff) | |
| download | illumos-joyent-cf607e7adae64e868ad748f0bf9f44ff02495aec.tar.gz | |
[illumos-gate merge]
commit cbc8e155c29643fa0d62159c2d3dee078ed6cc91
10355 uts: new-font project. Use terminus Unicode fonts for console.
commit c9aaca5d3825256aa6c09cc34e4ce5640630341b
10403 consfonts: update to terminus-font-4.47
commit 2d106d6b0c1dcb62c2b9842419c54acabdc3ca0f
10401 loader: biosvbe_get_mode is using wrong mask with ebx register
commit d1c9087b969ca22e13154e77ea4147ad672bc63b
10136 smatch fix for policykit
commit 2756274fa95226a2638604ba310268a09e4f4744
10143 smatch fix for ttymon
commit e83359656fe4880d77df4da075573820c2a7adc0
10393 ctf: NULL pointer errors
commit b83d2fbf46ff51c4409d2bf8ed4c483ef21f456f
10394 SPARC qemu panic in the fd module
Diffstat (limited to 'usr/src/uts/common/Makefile.files')
| -rw-r--r-- | usr/src/uts/common/Makefile.files | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files index 174141ea57..77479bcf24 100644 --- a/usr/src/uts/common/Makefile.files +++ b/usr/src/uts/common/Makefile.files @@ -1648,10 +1648,10 @@ TEM_OBJS += tem.o tem_safe.o # # Font data for generated 8x16 font # -VGATEXT_FONT = 8x16 -VGATEXT_FONT_SRC= 8859-1 -VGATEXT_FONT_DIR= $(UTSBASE)/common/font -FONT_OBJS += font.o 6x10.o 7x14.o 8x16.o 12x22.o +FONT = 8x16 +FONT_SRC= ter-u16n +FONT_DIR= $(SRC)/data/consfonts +FONT_OBJS += font.o $(FONT).o KBTRANS_OBJS += \ kbtrans.o \ |