[PATCH] UBUNTU: [Config] Fix up trusted keys annotation for i386
Krzysztof Kozlowski
krzysztof.kozlowski at canonical.com
Thu Mar 4 07:41:17 UTC 2021
From: Stefan Bader <stefan.bader at 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 at canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
Acked-by: Guilherme G. Piccoli <gpiccoli at canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg at canonical.com>
---
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
More information about the kernel-team
mailing list