[X][SRU][PATCH 3/3] UBUNTU: [Config]: enable highdpi Terminus 16x32 font support
Po-Hsu Lin
po-hsu.lin at canonical.com
Tue Mar 19 06:58:49 UTC 2019
BugLink: https://bugs.launchpad.net/bugs/1819881
Enable the Hi-DPI 16x32 font support.
Also enable the compiled-in font support.
Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 2 +-
debian.master/config/annotations | 3 ++-
debian.master/config/arm64/config.common.arm64 | 2 +-
debian.master/config/config.common.ubuntu | 2 ++
debian.master/config/i386/config.common.i386 | 2 +-
debian.master/config/powerpc/config.common.powerpc | 2 +-
debian.master/config/ppc64el/config.common.ppc64el | 2 +-
debian.master/config/s390x/config.common.s390x | 1 +
8 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 2bff22c..eece7cb 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -106,7 +106,7 @@ CONFIG_FIREWIRE_NOSY=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIXED_PHY=y
CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FRAME_WARN=1024
CONFIG_FUSION=y
CONFIG_GAMEPORT=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 424980a..d850fe2 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8163,7 +8163,7 @@ CONFIG_CRC32_SARWATE policy<{'amd64': 'n', 'arm64': '
CONFIG_CRC32_BIT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
# Menu: Library routines >> Select compiled-in fonts
-CONFIG_FONTS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
+CONFIG_FONTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_FONT_8x8 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
CONFIG_FONT_8x16 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
CONFIG_FONT_6x11 policy<{'armhf': 'n'}>
@@ -8175,6 +8175,7 @@ CONFIG_FONT_6x10 policy<{'armhf': 'y'}>
CONFIG_FONT_SUN8x16 policy<{'armhf': 'n'}>
CONFIG_FONT_SUN12x22 policy<{'armhf': 'n'}>
CONFIG_FONT_10x18 policy<{'armhf': 'n'}>
+CONFIG_FONT_TER16x32 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
# Menu: Library routines >> XZ decompression support
CONFIG_XZ_DEC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 18f8e06..6fd8c63 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -108,7 +108,7 @@ CONFIG_FIREWIRE_NOSY=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIXED_PHY=y
CONFIG_FMC=m
-# CONFIG_FONTS is not set
+FONFIG_FONTS=y
CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_FRAME_WARN=1024
CONFIG_FUSION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f39945d..d6de08a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2602,6 +2602,7 @@ CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m
CONFIG_FMC_TRIVIAL=m
CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FONTS=y
# CONFIG_FONT_10x18 is not set
CONFIG_FONT_6x10=y
# CONFIG_FONT_6x11 is not set
@@ -2614,6 +2615,7 @@ CONFIG_FONT_ACORN_8x8=y
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_SUN8x16 is not set
CONFIG_FONT_SUPPORT=y
+CONFIG_FONT_TER16x32=y
CONFIG_FORCEDETH=m
CONFIG_FPGA=m
CONFIG_FPGA_MGR_ZYNQ_FPGA=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 58b645e..11c0eb9 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -103,7 +103,7 @@ CONFIG_FIREWIRE_NOSY=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIXED_PHY=y
CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FRAME_WARN=1024
CONFIG_FUSION=y
CONFIG_GAMEPORT=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 41c182d..fd95812 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -97,7 +97,7 @@ CONFIG_FIREWIRE_NOSY=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIXED_PHY=y
CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FRAME_WARN=1024
CONFIG_FUSION=y
CONFIG_GAMEPORT=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index c77345c..22714c7 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -110,7 +110,7 @@ CONFIG_FIREWIRE_NOSY=m
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIXED_PHY=y
CONFIG_FMC=m
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FORCE_MAX_ZONEORDER=9
CONFIG_FRAME_WARN=2048
CONFIG_FUSION=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6d64fdf..3529e0a 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -87,6 +87,7 @@ CONFIG_DM_DEBUG=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_FIXED_PHY=m
# CONFIG_FMC is not set
+CONFIG_FONTS=y
CONFIG_FORCE_MAX_ZONEORDER=9
CONFIG_FRAME_WARN=1024
# CONFIG_FUSION is not set
--
2.7.4
More information about the kernel-team
mailing list