diff mbox series

[SRU,ubuntu-raspi2-5.3-bionic,1/1] UBUNTU: [Config] raspi2: Set NLS_ASCII=y

Message ID 20200603035938.26996-2-hui.wang@canonical.com
State New
Headers show
Series Set the CONFIG_NLS_ASCII to y | expand

Commit Message

Hui Wang June 3, 2020, 3:59 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1881631

This is used on all Raspberry Pis for mounting the VFAT boot partition,
so we might as well compile it directly into the kernel.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 .../abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules             | 1 -
 .../abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules             | 1 -
 debian.raspi2-bionic/config/annotations                        | 3 ++-
 debian.raspi2-bionic/config/config.common.ubuntu               | 2 +-
 debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules           | 1 -
 debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules           | 1 -
 debian.raspi2/config/annotations                               | 3 ++-
 debian.raspi2/config/config.common.ubuntu                      | 2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)

Comments

Kleber Sacilotto de Souza June 3, 2020, 7:53 a.m. UTC | #1
On 2020-06-03 05:59, Hui Wang wrote:
> BugLink: https://bugs.launchpad.net/bugs/1881631
> 
> This is used on all Raspberry Pis for mounting the VFAT boot partition,
> so we might as well compile it directly into the kernel.
> 
> Signed-off-by: Hui Wang <hui.wang@canonical.com>

Hi Hui,

The config changes of a backport is inherited from its master kernel,
so for config changes to be applied to bionic/linux-raspi2-5.3 it needs
to be applied to eoan/linux-raspi2.

Can you please resubmit the changes for eoan/linux-raspi2?


Thanks,
Kleber


> ---
>  .../abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules             | 1 -
>  .../abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules             | 1 -
>  debian.raspi2-bionic/config/annotations                        | 3 ++-
>  debian.raspi2-bionic/config/config.common.ubuntu               | 2 +-
>  debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules           | 1 -
>  debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules           | 1 -
>  debian.raspi2/config/annotations                               | 3 ++-
>  debian.raspi2/config/config.common.ubuntu                      | 2 +-
>  8 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
> index dbefa8efbb12..1317888c5f95 100644
> --- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
> +++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
> @@ -2376,7 +2376,6 @@ ni_usb6501
>  nilfs2
>  nixge
>  nlmon
> -nls_ascii
>  nls_cp1250
>  nls_cp1251
>  nls_cp1255
> diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
> index 0e3395bc99f0..4b7955b6d1f5 100644
> --- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
> +++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
> @@ -2389,7 +2389,6 @@ ni_usb6501
>  nilfs2
>  nixge
>  nlmon
> -nls_ascii
>  nls_cp1250
>  nls_cp1251
>  nls_cp1255
> diff --git a/debian.raspi2-bionic/config/annotations b/debian.raspi2-bionic/config/annotations
> index bd8a892f78aa..4363b522e317 100644
> --- a/debian.raspi2-bionic/config/annotations
> +++ b/debian.raspi2-bionic/config/annotations
> @@ -8353,7 +8353,7 @@ CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
>  CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> @@ -8381,6 +8381,7 @@ CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
>  CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  #
>  CONFIG_NLS                                      note<dependancy of boot essential>
> +CONFIG_NLS_ASCII                                note<LP:1881631>
>  
>  # Menu: File systems >> Network File Systems
>  CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.raspi2-bionic/config/config.common.ubuntu b/debian.raspi2-bionic/config/config.common.ubuntu
> index 674930178909..bcbde07d895f 100644
> --- a/debian.raspi2-bionic/config/config.common.ubuntu
> +++ b/debian.raspi2-bionic/config/config.common.ubuntu
> @@ -4856,7 +4856,7 @@ CONFIG_NI_XGE_MANAGEMENT_ENET=m
>  CONFIG_NLATTR=y
>  CONFIG_NLMON=m
>  CONFIG_NLS=y
> -CONFIG_NLS_ASCII=m
> +CONFIG_NLS_ASCII=y
>  CONFIG_NLS_CODEPAGE_1250=m
>  CONFIG_NLS_CODEPAGE_1251=m
>  CONFIG_NLS_CODEPAGE_437=y
> diff --git a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
> index dbefa8efbb12..1317888c5f95 100644
> --- a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
> +++ b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
> @@ -2376,7 +2376,6 @@ ni_usb6501
>  nilfs2
>  nixge
>  nlmon
> -nls_ascii
>  nls_cp1250
>  nls_cp1251
>  nls_cp1255
> diff --git a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
> index 0e3395bc99f0..4b7955b6d1f5 100644
> --- a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
> +++ b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
> @@ -2389,7 +2389,6 @@ ni_usb6501
>  nilfs2
>  nixge
>  nlmon
> -nls_ascii
>  nls_cp1250
>  nls_cp1251
>  nls_cp1255
> diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
> index bd8a892f78aa..4363b522e317 100644
> --- a/debian.raspi2/config/annotations
> +++ b/debian.raspi2/config/annotations
> @@ -8353,7 +8353,7 @@ CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
>  CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> @@ -8381,6 +8381,7 @@ CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
>  CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  #
>  CONFIG_NLS                                      note<dependancy of boot essential>
> +CONFIG_NLS_ASCII                                note<LP:1881631>
>  
>  # Menu: File systems >> Network File Systems
>  CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
> index 528d72d4962a..76c9a0d69472 100644
> --- a/debian.raspi2/config/config.common.ubuntu
> +++ b/debian.raspi2/config/config.common.ubuntu
> @@ -4857,7 +4857,7 @@ CONFIG_NI_XGE_MANAGEMENT_ENET=m
>  CONFIG_NLATTR=y
>  CONFIG_NLMON=m
>  CONFIG_NLS=y
> -CONFIG_NLS_ASCII=m
> +CONFIG_NLS_ASCII=y
>  CONFIG_NLS_CODEPAGE_1250=m
>  CONFIG_NLS_CODEPAGE_1251=m
>  CONFIG_NLS_CODEPAGE_437=y
>
Hui Wang June 3, 2020, 8:11 a.m. UTC | #2
On 2020/6/3 下午3:53, Kleber Souza wrote:
> On 2020-06-03 05:59, Hui Wang wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1881631
>>
>> This is used on all Raspberry Pis for mounting the VFAT boot partition,
>> so we might as well compile it directly into the kernel.
>>
>> Signed-off-by: Hui Wang <hui.wang@canonical.com>
> Hi Hui,
>
> The config changes of a backport is inherited from its master kernel,
> so for config changes to be applied to bionic/linux-raspi2-5.3 it needs
> to be applied to eoan/linux-raspi2.
>
> Can you please resubmit the changes for eoan/linux-raspi2?

OK, got it . will resubmit it soon.

Thanks,

Hui.


>
> Thanks,
> Kleber
>
>
>> ---
>>   .../abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules             | 1 -
>>   .../abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules             | 1 -
>>   debian.raspi2-bionic/config/annotations                        | 3 ++-
>>   debian.raspi2-bionic/config/config.common.ubuntu               | 2 +-
>>   debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules           | 1 -
>>   debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules           | 1 -
>>   debian.raspi2/config/annotations                               | 3 ++-
>>   debian.raspi2/config/config.common.ubuntu                      | 2 +-
>>   8 files changed, 6 insertions(+), 8 deletions(-)
>>
>> diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
>> index dbefa8efbb12..1317888c5f95 100644
>> --- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
>> +++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
>> @@ -2376,7 +2376,6 @@ ni_usb6501
>>   nilfs2
>>   nixge
>>   nlmon
>> -nls_ascii
>>   nls_cp1250
>>   nls_cp1251
>>   nls_cp1255
>> diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
>> index 0e3395bc99f0..4b7955b6d1f5 100644
>> --- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
>> +++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
>> @@ -2389,7 +2389,6 @@ ni_usb6501
>>   nilfs2
>>   nixge
>>   nlmon
>> -nls_ascii
>>   nls_cp1250
>>   nls_cp1251
>>   nls_cp1255
>> diff --git a/debian.raspi2-bionic/config/annotations b/debian.raspi2-bionic/config/annotations
>> index bd8a892f78aa..4363b522e317 100644
>> --- a/debian.raspi2-bionic/config/annotations
>> +++ b/debian.raspi2-bionic/config/annotations
>> @@ -8353,7 +8353,7 @@ CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
>>   CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> -CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> +CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> @@ -8381,6 +8381,7 @@ CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
>>   CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   #
>>   CONFIG_NLS                                      note<dependancy of boot essential>
>> +CONFIG_NLS_ASCII                                note<LP:1881631>
>>   
>>   # Menu: File systems >> Network File Systems
>>   CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>> diff --git a/debian.raspi2-bionic/config/config.common.ubuntu b/debian.raspi2-bionic/config/config.common.ubuntu
>> index 674930178909..bcbde07d895f 100644
>> --- a/debian.raspi2-bionic/config/config.common.ubuntu
>> +++ b/debian.raspi2-bionic/config/config.common.ubuntu
>> @@ -4856,7 +4856,7 @@ CONFIG_NI_XGE_MANAGEMENT_ENET=m
>>   CONFIG_NLATTR=y
>>   CONFIG_NLMON=m
>>   CONFIG_NLS=y
>> -CONFIG_NLS_ASCII=m
>> +CONFIG_NLS_ASCII=y
>>   CONFIG_NLS_CODEPAGE_1250=m
>>   CONFIG_NLS_CODEPAGE_1251=m
>>   CONFIG_NLS_CODEPAGE_437=y
>> diff --git a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
>> index dbefa8efbb12..1317888c5f95 100644
>> --- a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
>> +++ b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
>> @@ -2376,7 +2376,6 @@ ni_usb6501
>>   nilfs2
>>   nixge
>>   nlmon
>> -nls_ascii
>>   nls_cp1250
>>   nls_cp1251
>>   nls_cp1255
>> diff --git a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
>> index 0e3395bc99f0..4b7955b6d1f5 100644
>> --- a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
>> +++ b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
>> @@ -2389,7 +2389,6 @@ ni_usb6501
>>   nilfs2
>>   nixge
>>   nlmon
>> -nls_ascii
>>   nls_cp1250
>>   nls_cp1251
>>   nls_cp1255
>> diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
>> index bd8a892f78aa..4363b522e317 100644
>> --- a/debian.raspi2/config/annotations
>> +++ b/debian.raspi2/config/annotations
>> @@ -8353,7 +8353,7 @@ CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
>>   CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> -CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> +CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>> @@ -8381,6 +8381,7 @@ CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
>>   CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>>   #
>>   CONFIG_NLS                                      note<dependancy of boot essential>
>> +CONFIG_NLS_ASCII                                note<LP:1881631>
>>   
>>   # Menu: File systems >> Network File Systems
>>   CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>> diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
>> index 528d72d4962a..76c9a0d69472 100644
>> --- a/debian.raspi2/config/config.common.ubuntu
>> +++ b/debian.raspi2/config/config.common.ubuntu
>> @@ -4857,7 +4857,7 @@ CONFIG_NI_XGE_MANAGEMENT_ENET=m
>>   CONFIG_NLATTR=y
>>   CONFIG_NLMON=m
>>   CONFIG_NLS=y
>> -CONFIG_NLS_ASCII=m
>> +CONFIG_NLS_ASCII=y
>>   CONFIG_NLS_CODEPAGE_1250=m
>>   CONFIG_NLS_CODEPAGE_1251=m
>>   CONFIG_NLS_CODEPAGE_437=y
>>
diff mbox series

Patch

diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
index dbefa8efbb12..1317888c5f95 100644
--- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
+++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/arm64/raspi2.modules
@@ -2376,7 +2376,6 @@  ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
index 0e3395bc99f0..4b7955b6d1f5 100644
--- a/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
+++ b/debian.raspi2-bionic/abi/5.3.0-1026.28~18.04.1/armhf/raspi2.modules
@@ -2389,7 +2389,6 @@  ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2-bionic/config/annotations b/debian.raspi2-bionic/config/annotations
index bd8a892f78aa..4363b522e317 100644
--- a/debian.raspi2-bionic/config/annotations
+++ b/debian.raspi2-bionic/config/annotations
@@ -8353,7 +8353,7 @@  CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -8381,6 +8381,7 @@  CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 #
 CONFIG_NLS                                      note<dependancy of boot essential>
+CONFIG_NLS_ASCII                                note<LP:1881631>
 
 # Menu: File systems >> Network File Systems
 CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.raspi2-bionic/config/config.common.ubuntu b/debian.raspi2-bionic/config/config.common.ubuntu
index 674930178909..bcbde07d895f 100644
--- a/debian.raspi2-bionic/config/config.common.ubuntu
+++ b/debian.raspi2-bionic/config/config.common.ubuntu
@@ -4856,7 +4856,7 @@  CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NLATTR=y
 CONFIG_NLMON=m
 CONFIG_NLS=y
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_CODEPAGE_437=y
diff --git a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
index dbefa8efbb12..1317888c5f95 100644
--- a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
+++ b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
@@ -2376,7 +2376,6 @@  ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
index 0e3395bc99f0..4b7955b6d1f5 100644
--- a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
+++ b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
@@ -2389,7 +2389,6 @@  ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
index bd8a892f78aa..4363b522e317 100644
--- a/debian.raspi2/config/annotations
+++ b/debian.raspi2/config/annotations
@@ -8353,7 +8353,7 @@  CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -8381,6 +8381,7 @@  CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 #
 CONFIG_NLS                                      note<dependancy of boot essential>
+CONFIG_NLS_ASCII                                note<LP:1881631>
 
 # Menu: File systems >> Network File Systems
 CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 528d72d4962a..76c9a0d69472 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -4857,7 +4857,7 @@  CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NLATTR=y
 CONFIG_NLMON=m
 CONFIG_NLS=y
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_CODEPAGE_437=y