[D][SRU][PATCHv2 1/1] UBUNTU: [Config]: enable highdpi Terminus 16x32 font support
Seth Forshee
seth.forshee at canonical.com
Wed Mar 20 20:59:31 UTC 2019
On Tue, Mar 19, 2019 at 04:34:40PM +0800, Po-Hsu Lin wrote:
> 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>
This doesn't look right, we shouldn't have CONFIG_FONTS=y in both the
architecure configs and config.common.ubuntu. Did you run updateconfigs
after making your changes?
> ---
> debian.master/config/amd64/config.common.amd64 | 2 +-
> debian.master/config/annotations | 4 ++--
> debian.master/config/arm64/config.common.arm64 | 2 +-
> debian.master/config/config.common.ubuntu | 3 ++-
> debian.master/config/i386/config.common.i386 | 2 +-
> debian.master/config/ppc64el/config.common.ppc64el | 2 +-
> debian.master/config/s390x/config.common.s390x | 2 +-
> 7 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index c33cba4..306db11 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -159,7 +159,7 @@ CONFIG_FIREWIRE=m
> CONFIG_FIREWIRE_NOSY=m
> CONFIG_FIXED_PHY=y
> CONFIG_FMC=m
> -# CONFIG_FONTS is not set
> +CONFIG_FONTS=y
> CONFIG_FPGA_BRIDGE=m
> CONFIG_FPGA_DFL=m
> CONFIG_FRAME_WARN=1024
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 549fbf4..0aed3ce 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -10490,7 +10490,7 @@ CONFIG_CRC32_SARWATE policy<{'amd64': 'n', 'arm64': '
> CONFIG_CRC32_BIT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>
> # Menu: Library routines >> Select compiled-in fonts
> -CONFIG_FONTS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> +CONFIG_FONTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> CONFIG_FONT_8x8 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> CONFIG_FONT_8x16 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> CONFIG_FONT_6x11 policy<{'armhf': 'n'}>
> @@ -10502,7 +10502,7 @@ CONFIG_FONT_6x10 policy<{'armhf': 'y'}>
> CONFIG_FONT_10x18 policy<{'armhf': 'n'}>
> CONFIG_FONT_SUN8x16 policy<{'armhf': 'n'}>
> CONFIG_FONT_SUN12x22 policy<{'armhf': 'n'}>
> -CONFIG_FONT_TER16x32 policy<{'armhf': 'n'}>
> +CONFIG_FONT_TER16x32 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>
> # Menu: Library routines >> XZ decompression support
> CONFIG_XZ_DEC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index 35b761a..93fc7cc 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -162,7 +162,7 @@ CONFIG_FIREWIRE=m
> CONFIG_FIREWIRE_NOSY=m
> CONFIG_FIXED_PHY=y
> CONFIG_FMC=m
> -# CONFIG_FONTS is not set
> +CONFIG_FONTS=y
> CONFIG_FORCE_MAX_ZONEORDER=13
> CONFIG_FPGA_BRIDGE=m
> CONFIG_FPGA_DFL=m
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 9f2a3f7..df655b9 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -3144,6 +3144,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
> @@ -3156,7 +3157,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 is not set
> +CONFIG_FONT_TER16x32=y
> CONFIG_FORCEDETH=m
> CONFIG_FORCE_PCI=y
> CONFIG_FORCE_SMP=y
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 33740d9..e21d0f4 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -156,7 +156,7 @@ CONFIG_FIREWIRE=m
> CONFIG_FIREWIRE_NOSY=m
> CONFIG_FIXED_PHY=y
> CONFIG_FMC=m
> -# CONFIG_FONTS is not set
> +CONFIG_FONTS=y
> CONFIG_FPGA_BRIDGE=m
> CONFIG_FPGA_DFL=m
> CONFIG_FRAME_WARN=1024
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index 237860c..399559b 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -156,7 +156,7 @@ CONFIG_FIREWIRE=m
> CONFIG_FIREWIRE_NOSY=m
> CONFIG_FIXED_PHY=y
> CONFIG_FMC=m
> -# CONFIG_FONTS is not set
> +CONFIG_FONTS=y
> CONFIG_FORCE_MAX_ZONEORDER=9
> CONFIG_FPGA_BRIDGE=m
> CONFIG_FPGA_DFL=m
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index a0ae783..59d5b17 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -144,7 +144,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m
> # CONFIG_FIREWIRE_NOSY is not set
> CONFIG_FIXED_PHY=m
> # CONFIG_FMC is not set
> -# CONFIG_FONTS is not set
> +CONFIG_FONTS=y
> CONFIG_FORCE_MAX_ZONEORDER=9
> # CONFIG_FPGA_BRIDGE is not set
> # CONFIG_FPGA_DFL is not set
> --
> 2.7.4
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
More information about the kernel-team
mailing list