diff mbox series

[SRU,Focal] UBUNTU: [Config] Fix up trusted keys annotation for i386

Message ID 20210226092004.74615-1-stefan.bader@canonical.com
State New
Headers show
Series [SRU,Focal] UBUNTU: [Config] Fix up trusted keys annotation for i386 | expand

Commit Message

Stefan Bader Feb. 26, 2021, 9:20 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1898716

When adding the annotations for CONFIG_SYSTEM_TRUSTED_KEYS the i386
string accidentally missed the '.pem' extension. This does not matter
for Focal itself and most derivatives. Just bionic:linux-hwe-5.4 will
fail to build that way. Fixing the annotation in Focal so future updates
will work correctly.

Ignore: yes
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

Proposing to hide the commit from the changelog because this does not
change anything there. We only build i386 for hwe-5.4.

-Stefan

 debian.master/config/annotations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kleber Souza Feb. 26, 2021, 9:46 a.m. UTC | #1
On 26.02.21 10:20, Stefan Bader wrote:
> BugLink: https://bugs.launchpad.net/bugs/1898716
> 
> When adding the annotations for CONFIG_SYSTEM_TRUSTED_KEYS the i386
> string accidentally missed the '.pem' extension. This does not matter
> for Focal itself and most derivatives. Just bionic:linux-hwe-5.4 will
> fail to build that way. Fixing the annotation in Focal so future updates
> will work correctly.
> 
> Ignore: yes
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
> 
> Proposing to hide the commit from the changelog because this does not
> change anything there. We only build i386 for hwe-5.4.
> 
> -Stefan
> 
>   debian.master/config/annotations | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 91886242ae10..decbd099b916 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -351,7 +351,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING                 mark<ENFORCED>
>   
>   # Menu: Cryptographic API >> Certificates for signature checking >> Provide system-wide ring of trusted keys
>   CONFIG_SYSTEM_TRUSTED_KEYRING                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
> +CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs.pem"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
>   CONFIG_SYSTEM_EXTRA_CERTIFICATE                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>   CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE            policy<{'amd64': '4096', 'arm64': '4096', 'armhf': '4096', 'i386': '4096', 'ppc64el': '4096', 's390x': '4096'}>
>   CONFIG_SECONDARY_TRUSTED_KEYRING                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>
Guilherme Piccoli Feb. 26, 2021, 12:21 p.m. UTC | #2
On Fri, Feb 26, 2021 at 6:20 AM Stefan Bader <stefan.bader@canonical.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/1898716
>
> When adding the annotations for CONFIG_SYSTEM_TRUSTED_KEYS the i386
> string accidentally missed the '.pem' extension. This does not matter
> for Focal itself and most derivatives. Just bionic:linux-hwe-5.4 will
> fail to build that way. Fixing the annotation in Focal so future updates
> will work correctly.
>
> Ignore: yes
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>
> Proposing to hide the commit from the changelog because this does not
> change anything there. We only build i386 for hwe-5.4.
>
> -Stefan
>
>  debian.master/config/annotations | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 91886242ae10..decbd099b916 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -351,7 +351,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING                 mark<ENFORCED>
>
>  # Menu: Cryptographic API >> Certificates for signature checking >> Provide system-wide ring of trusted keys
>  CONFIG_SYSTEM_TRUSTED_KEYRING                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
> +CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs.pem"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
>  CONFIG_SYSTEM_EXTRA_CERTIFICATE                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE            policy<{'amd64': '4096', 'arm64': '4096', 'armhf': '4096', 'i386': '4096', 'ppc64el': '4096', 's390x': '4096'}>
>  CONFIG_SECONDARY_TRUSTED_KEYRING                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> --
> 2.25.1

Thanks Stefan,

Acked-by: Guilherme G. Piccoli <gpiccoli@canonical.com>
Kelsey Skunberg March 1, 2021, 11:27 p.m. UTC | #3
applied to Focal/master-next. Thank you! 

-Kelsey

On 2021-02-26 10:20:04 , Stefan Bader wrote:
> BugLink: https://bugs.launchpad.net/bugs/1898716
> 
> When adding the annotations for CONFIG_SYSTEM_TRUSTED_KEYS the i386
> string accidentally missed the '.pem' extension. This does not matter
> for Focal itself and most derivatives. Just bionic:linux-hwe-5.4 will
> fail to build that way. Fixing the annotation in Focal so future updates
> will work correctly.
> 
> Ignore: yes
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
> 
> Proposing to hide the commit from the changelog because this does not
> change anything there. We only build i386 for hwe-5.4.
> 
> -Stefan
> 
>  debian.master/config/annotations | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 91886242ae10..decbd099b916 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -351,7 +351,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING                 mark<ENFORCED>
>  
>  # Menu: Cryptographic API >> Certificates for signature checking >> Provide system-wide ring of trusted keys
>  CONFIG_SYSTEM_TRUSTED_KEYRING                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
> +CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs.pem"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
>  CONFIG_SYSTEM_EXTRA_CERTIFICATE                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE            policy<{'amd64': '4096', 'arm64': '4096', 'armhf': '4096', 'i386': '4096', 'ppc64el': '4096', 's390x': '4096'}>
>  CONFIG_SECONDARY_TRUSTED_KEYRING                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 91886242ae10..decbd099b916 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -351,7 +351,7 @@  CONFIG_SYSTEM_BLACKLIST_KEYRING                 mark<ENFORCED>
 
 # Menu: Cryptographic API >> Certificates for signature checking >> Provide system-wide ring of trusted keys
 CONFIG_SYSTEM_TRUSTED_KEYRING                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
+CONFIG_SYSTEM_TRUSTED_KEYS                      policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'i386': '"debian/canonical-certs.pem"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}>
 CONFIG_SYSTEM_EXTRA_CERTIFICATE                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE            policy<{'amd64': '4096', 'arm64': '4096', 'armhf': '4096', 'i386': '4096', 'ppc64el': '4096', 's390x': '4096'}>
 CONFIG_SECONDARY_TRUSTED_KEYRING                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>