| Message ID | 20210304074117.7042-1-krzysztof.kozlowski@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | UBUNTU: [Config] Fix up trusted keys annotation for i386 | expand |
On Thu, 4 Mar 2021 at 08:41, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> wrote: > > From: Stefan Bader <stefan.bader@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1898716 Sorry, my mistake! This should not be sent. Best regards, Krzysztof
On 04.03.21 08:42, Krzysztof Kozlowski wrote: > On Thu, 4 Mar 2021 at 08:41, Krzysztof Kozlowski > <krzysztof.kozlowski@canonical.com> wrote: >> >> From: Stefan Bader <stefan.bader@canonical.com> >> >> BugLink: https://bugs.launchpad.net/bugs/1898716 > > Sorry, my mistake! This should not be sent. > Hi Krzysztof, Could you please send a reply with "NAK" or "NACK" as prefix on the subject so we can easily identify patches that can be ignored? Thanks! Kleber
On 04/03/2021 08:41, Krzysztof Kozlowski wrote: > From: Stefan Bader <stefan.bader@canonical.com> > > 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> > Acked-by: Guilherme G. Piccoli <gpiccoli@canonical.com> > Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com> > --- > debian.master/config/annotations | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > My mistake, please ignore.
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'}>