From patchwork Thu Mar 4 07:41:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1447149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrjVD3fFmz9sTD; Thu, 4 Mar 2021 18:41:24 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lHibp-00072g-BJ; Thu, 04 Mar 2021 07:41:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lHibn-00072a-5K for kernel-team@lists.ubuntu.com; Thu, 04 Mar 2021 07:41:19 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lHibm-0002Xx-TS for kernel-team@lists.ubuntu.com; Thu, 04 Mar 2021 07:41:18 +0000 Received: by mail-ed1-f72.google.com with SMTP id v27so6667971edx.1 for ; Wed, 03 Mar 2021 23:41:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pOaRu8UobVa/cY5XDF7Q3/3ZxarBPyIaM7A5D64CVag=; b=Uj43i5en8WmqTkGLggO6Q1GiRlHhUz1A3xGgBboypes0WpYOf4ez7g73NPWcWcOpNK i1V4BU4WlXAc8q7/rAmDIikWS00Wpbvq8n9TvoslSE0QnjGMWpWYk9lJtzimmK11IuJm G4BSgZthAAiIzQiu7NURCqNhWJX95s+DvLJ/Ke586RLkYnJG78Nrunr1RLKH7pVKgaiu V2tDxsvqs5lTAZ6A43bdE5v5qQM2cbMw35SAenr6xQM7AaMDE8mwMWH4Pn331xGYMwau nMqWBnPGDLopXv95yldgyiUGaRCItaUe6fgfW8vwY8uvx35UXDlL0dhIsaUw8MPmi+1v hXiQ== X-Gm-Message-State: AOAM532pofKtp+buQz0MsYyJYJTQ4otF0kVYxS+CqXmt4qskotp/2M13 0IYpR7cZM3obLBbObqdpb/WwITChsv26o/+xGZfROkq2IhqSKT3O+87FMfiqY/GOQqX0W+6sMZq yqVrblOSWrUFz5JeD0x424jrLAoBx96tx7w/lf/65/A== X-Received: by 2002:a17:906:814b:: with SMTP id z11mr2817675ejw.290.1614843678475; Wed, 03 Mar 2021 23:41:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWUlzWsdT7SGxD+eS6bvZ5AZx0X0tW+4wYtvdseB9xmHUCm/to8BhnKSAiS33FBWCnhu2reg== X-Received: by 2002:a17:906:814b:: with SMTP id z11mr2817668ejw.290.1614843678371; Wed, 03 Mar 2021 23:41:18 -0800 (PST) Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.gmail.com with ESMTPSA id gq25sm8722112ejb.85.2021.03.03.23.41.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 23:41:17 -0800 (PST) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Fix up trusted keys annotation for i386 Date: Thu, 4 Mar 2021 08:41:17 +0100 Message-Id: <20210304074117.7042-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Bader 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 Acked-by: Kleber Sacilotto de Souza Acked-by: Guilherme G. Piccoli Signed-off-by: Kelsey Skunberg --- 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 # 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'}>