From patchwork Tue Feb 8 15:50:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=dcN/J9wt; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtSCt6lQ9z9s0B for ; Wed, 9 Feb 2022 02:51:06 +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 1nHSld-0004YA-BH; Tue, 08 Feb 2022 15:50:57 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHSla-0004Ul-OT for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 15:50:54 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B4DAE3F324 for ; Tue, 8 Feb 2022 15:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644335453; bh=KV9npypRGNGhFABa9KevjIc8uRSL/PibzB3OsqXAtn8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dcN/J9wtFXJfrWRJy1FpvJRPc7cdh1BO4uPvxW4eFuI8QuANVQ/mhD3fPs+qSvK13 UMZVKw3SIw1sNdaeN4oBZnbv8RcmHiiAYsSM2Dw/jK894rvt7bVynDA8r7zEgGJBgk An15Ui9InY1CH72Tt6oljlgQraswZK9Asj+zuGcuwwIac3EAe3RdSIgt8pZ7n3uBrc Fhxwmhgi4L5vgl0wFwlmusEpXT50nuyaSNulud3N36hZcDXvMiLuz5WHzzpVyc4jkg zpfUOTV6IHMTIm5Y4BxIr8i313MSap3s3ePTNh296VrfA7P5KIAbg33NSuq7f+gSBX hnsSkhyjuh6pA== Received: by mail-ed1-f69.google.com with SMTP id g5-20020a056402090500b0040f28e1da47so6253870edz.8 for ; Tue, 08 Feb 2022 07:50:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KV9npypRGNGhFABa9KevjIc8uRSL/PibzB3OsqXAtn8=; b=sqaSKS5fedGk6VdNevxiLNVkUQNMUNU3P4fYGTV7fIN18ervLIKFEh51gT7HbqrLwG S2Jw6h5GR4XQ6wizDAtjvo7pcAUxbgp4FGHFVZZHKQexlqbwrMQc77LKWwMBjjdbnS5O 4OBXkUdIeNjXi8WzILj/dGQScnnfJwQWpzqhST9RZ9AdK0bGz+WOPmoejy6sr/sAUmaR N2J5xRxW6FRu7BxIU8Es+qtgbCE8I3adrIMEAZwp2LlHTSPLvbQb/2CVVTR4AAuiW6tb VpCWfLUK5EPSpt1ojjzv8PqEE8WqBo7BibZQ7SPAMJS6c7YCcT6vn7GsSIZysvM9X1Ym JfuQ== X-Gm-Message-State: AOAM533W8+gmekQBI63h7chLNIcIajhh3C3vcEJeuOwTmcxvBWKQXWn9 GBzRhx4H3JxUz+kKQo7hBM2E3/Gpr+PpGeptMEsLdyoalGJHun13+5iT2vkATjlaFWOobZms9nM RoZE6uCAv3WxUuG34pYn6jQ1JyepmDt9v5iEEzV/bfA== X-Received: by 2002:a50:a6d3:: with SMTP id f19mr5117756edc.148.1644335452663; Tue, 08 Feb 2022 07:50:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWmeXgjmJVNXmLP+HJmkYAOuZRhMQfjrkB3B3PqKgXuOr7w2wA1cceymWPEhOzr7FocmTxEA== X-Received: by 2002:a50:a6d3:: with SMTP id f19mr5117733edc.148.1644335452353; Tue, 08 Feb 2022 07:50:52 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id hg8sm1795011ejc.185.2022.02.08.07.50.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 07:50:52 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][linux-signed-uc22][PATCH 1/5] debian/control: explicitely declare only amd64 as UEFI signed Date: Tue, 8 Feb 2022 15:50:38 +0000 Message-Id: <20220208155042.273128-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208155042.273128-1-dimitri.ledkov@canonical.com> References: <20220208155042.273128-1-dimitri.ledkov@canonical.com> 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" Only attempt signing on amd64, and update descriptions to state that. Also update lowlatency kernel to state correct flavour name. Signed-off-by: Dimitri John Ledkov --- debian/control.stub | 12 ++++++------ debian/rules | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index 7ae5b0381f..a10343214e 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -4,7 +4,7 @@ Priority: optional Maintainer: Canonical Kernel Team Build-Depends: debhelper (>= 9) Build-Depends-Arch: - @UNSIGNED_SRC_PACKAGE@ (>= @UNSIGNED_SRC_VERSION@), + @UNSIGNED_SRC_PACKAGE@ (>= @UNSIGNED_SRC_VERSION@) [amd64], python3, python3-apt, Standards-Version: 3.9.4 @@ -12,13 +12,13 @@ Standards-Version: 3.9.4 Package: linux-image-uc22-generic Architecture: amd64 Depends: linux-firmware, wireless-regdb, linux-modules-@ABI@-generic, linux-modules-extra-@ABI@-generic -Description: Signed UC22 kernel image generic +Description: UC22 kernel image generic A kernel image for generic UC22. This version of it is signed with - Canonical's UEFI signing key. + Canonical's UEFI signing key on amd64. Package: linux-image-uc22-lowlatency Architecture: amd64 Depends: linux-firmware, wireless-regdb, linux-modules-@ABI@-lowlatency -Description: Signed UC22 kernel image generic - A kernel image for generic UC22. This version of it is signed with - Canonical's UEFI signing key. +Description: UC22 kernel image lowlatency + A kernel image for lowlatency UC22. This version of it is signed with + Canonical's UEFI signing key on amd64. diff --git a/debian/rules b/debian/rules index 425812f6b6..228ca2e3ff 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #! /usr/bin/make -f +include /usr/share/dpkg/default.mk + SOURCE=$(shell dpkg-parsechangelog -S Source) VERSION=$(shell dpkg-parsechangelog -S Version) ABI=$(shell echo "$(VERSION)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') @@ -28,6 +30,7 @@ debian/control: %: dh $@ +ifneq (,$(filter $(DEB_HOST_ARCH), amd64)) override_dh_auto_build: ./download-signed "linux-uc22" "$(UNSIGNED_VER)" "$(UNSIGNED_SRC)" mkdir SIGNED @@ -56,3 +59,4 @@ override_dh_auto_install: override_dh_fixperms: dh_fixperms -X/boot/ +endif From patchwork Tue Feb 8 15:50:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=eDjD7BR/; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtSD072ZZz9s0B for ; Wed, 9 Feb 2022 02:51:12 +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 1nHSli-0004ff-Uv; Tue, 08 Feb 2022 15:51:02 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHSlh-0004c9-0u for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 15:51:01 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 7896A3F1E0 for ; Tue, 8 Feb 2022 15:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644335458; bh=3nDUSOKLnvq+jju2PmQFgD83XDeQQCOJGBoXTEOpth0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eDjD7BR/nWVTPQYgNmp4fg9/wn9JoljqaswAdIjibJSHv0SGV9DfTKFZpNkFBygHe xAelpQMAtkvCZmZ/DxEFPdTyGmtRd8T25fR2r4u/KJV86m1KDKEP1JS7iF76WtSoTZ 7aXkmgACzEI/AmFYWldmgYurK36mKbmhlPh+xDrPCQPWOZdyno1GYHQdF5AlHsGvpv Bk+dKFB8tpgqSltMd//nz/6GRC9g2TlXiCIVuRiQ8hJwhnUjyQcCl7k4ZK7IKXL41W qZnquy7B3XPubzdVS2eyVgmKN3e2QRWqEw2cIw8F6UfCDWCuUuIJ6StaulSDR+FYYf McIa+W/u0LqMA== Received: by mail-ej1-f71.google.com with SMTP id o4-20020a170906768400b006a981625756so5946222ejm.0 for ; Tue, 08 Feb 2022 07:50:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3nDUSOKLnvq+jju2PmQFgD83XDeQQCOJGBoXTEOpth0=; b=RbzTRmipUiHnCpwSr7Rvx4KeuRsFJLFaAb9ePdr1q8vOQirbTmcCtzvv7EwewVdaaj uDorIdz15DM/V2vWNlpCfb6m/pOr1kO4K6pTOhUp9q6Xr+10o3LUA2kiiVkaxpzhb3Cn EQlHfbZ+F/nxH0vPJc7O67OWArCZhk+K4oR129LYrmRnWLlTvWozvVP9LjtjYT6djYOx gilrHFmthlFC/GSWbKNSj4gLRUK+Xzp7qS6ZMevJ1a7009EAEz0EkuBO69tureN3eHaW wlj/D/tMszcZ7egKHYoNRSZAvlpiTkwC9RgyozEwVa+GkB5wtp5X9zLOa6tRFrxOXgnz lj5g== X-Gm-Message-State: AOAM5334BjJixQ5dxQj4kkmdvP8rNNWJZ2aNjGw0gZ+88+tpcG9qyhZ5 ngLmpr38LRLK4Rzj+h/6FqSwiaZ1Yl22fqTmzwWONlV751GNysCA4QEPz23ijK+fv4dBFeiRE0K HtrEfkD+RUIGk2R3nV6tLKSWQkFnlGR+qmmyR3ddWhQ== X-Received: by 2002:a17:907:da3:: with SMTP id go35mr4198222ejc.456.1644335455608; Tue, 08 Feb 2022 07:50:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAqpEZ8gRO2IVnFZ5A+Z93pErmw8Mg03X9TjE1epfKLJIVUI+MRMeO09URY6oMV6tBz9u3Jw== X-Received: by 2002:a17:907:da3:: with SMTP id go35mr4198208ejc.456.1644335455370; Tue, 08 Feb 2022 07:50:55 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id t22sm6839347edv.105.2022.02.08.07.50.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 07:50:55 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][linux-signed-uc22][PATCH 2/5] debian/control.stub: introduce unsigned packages on arm64 armhf Date: Tue, 8 Feb 2022 15:50:39 +0000 Message-Id: <20220208155042.273128-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208155042.273128-1-dimitri.ledkov@canonical.com> References: <20220208155042.273128-1-dimitri.ledkov@canonical.com> 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" Previously, in uc20, we would hard code swm expected version of this source package in snapcraft.yaml and blindly build armhf/arm64 versions of the snaps even though the corresponding -XX.YY.SS version of the deb did not exist. Introduce vmlinuz based linux-image-uc22-generic package on all architectures which provides the right kernel image and matching modules as expected to be vendored into kernel snap. This will simplify snapcraft.yaml and make archive debs versions, match snapcraft / snap versions, and pacify swm expecting strictly the same version numbers across all architectures. Signed-off-by: Dimitri John Ledkov --- debian/control.stub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index a10343214e..d524b69909 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -10,8 +10,8 @@ Build-Depends-Arch: Standards-Version: 3.9.4 Package: linux-image-uc22-generic -Architecture: amd64 -Depends: linux-firmware, wireless-regdb, linux-modules-@ABI@-generic, linux-modules-extra-@ABI@-generic +Architecture: amd64 arm64 armhf +Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-generic [arm64 armhf], linux-modules-@ABI@-generic, linux-modules-extra-@ABI@-generic Description: UC22 kernel image generic A kernel image for generic UC22. This version of it is signed with Canonical's UEFI signing key on amd64. From patchwork Tue Feb 8 15:50:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=YkOjpXm+; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtSCw3T0yz9s0B for ; Wed, 9 Feb 2022 02:51:08 +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 1nHSle-0004aL-LP; Tue, 08 Feb 2022 15:50:58 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHSld-0004Y9-Fa for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 15:50:57 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 39E2F3F1CD for ; Tue, 8 Feb 2022 15:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644335457; bh=aum+qbJ0lzAV/PU0kiHMsf9mXwZ+IIV0/EFqnIJHegk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YkOjpXm+ni0nr6M0iuomMT3IvfyQFnIvrWTqVX/l8u3tXblhGvq9YH5s0O+wAvEzA mM+9lyK9V/+/y9bQ6pR18hODbwpYFYT7HWqNXO2hNPZ+eVWtjhqHSujCMUvmEPD+EQ dZlh9LguaOih2LnRdby+H4VECbyJsGU5/fqWZt6Lp4+E/exCAgni4E423mq1zVT1Pb Xo2HslxFoDP2fuwARsDmlXf3aJHJkIBgviOTdF531k41F+jO06+dnvC+7CHzfmXB3Q ABYgFutEWSlvN6iSp+xPE0n4/oM2TxNaQcsL3R7mfwcfDYzsv3egMbSHXLGUP1rZ8p MD+DeA5QB7jyw== Received: by mail-ej1-f70.google.com with SMTP id d7-20020a1709061f4700b006bbf73a7becso5911597ejk.17 for ; Tue, 08 Feb 2022 07:50:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aum+qbJ0lzAV/PU0kiHMsf9mXwZ+IIV0/EFqnIJHegk=; b=sjCkoUGHL4ZIUQykXCFp/MPUjUKI/A1V0U26r+fqeIFYyD8WuYCqzQcOmt3M95IUFT i1H7lWWP8z1uCGTfvp8VNFrmtI/hhslGvNer8JkGG9bBPzxcJqHqFL0dB1fByYbxGR57 6D1jq6eaxhGDM5QHke3CJveeTfRlSh4wcuM3V2t85Y2U2qEFfM2EBkSlD+cJdjNnJ8h8 GfgP6Hmzhuk/Xq+GOF9dSX7KdaP3LG0S2CGneBpLdAFAmJKkJ52eUGCndvmwImJZYr2Q SkbPJ4HtDaQLQIzZ5idrhnTH1vfdhLUPn60MhJGJwd9N2z5Bh3/IpbRJVaRmeRWuGDNf DddA== X-Gm-Message-State: AOAM531FjvKq97IlVqGiGtnl6Wg19rQ3WNCPPqFfPLFmQwvhz2awh6lf 8LK1e4B99PQmFx4vRWsWkq6MHryBToyRmYW7pdZjQ91KrS83WREj4OwWNhA33A0iCN+rmkN76ug jgjak0Fh2T3OeAOB1vLzGoZatzYeUCA3Sc0czmZurzQ== X-Received: by 2002:aa7:c154:: with SMTP id r20mr5041999edp.183.1644335456766; Tue, 08 Feb 2022 07:50:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJynqoYmQ3yuXmSY3msqdxswDjHCY11qC9Cpa1OEQvVIJt3jc+DdmQeMUIXVsfJiM6tt9a8+vQ== X-Received: by 2002:aa7:c154:: with SMTP id r20mr5041979edp.183.1644335456507; Tue, 08 Feb 2022 07:50:56 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id pj9sm3086379ejb.124.2022.02.08.07.50.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 07:50:56 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][linux-signed-uc22][PATCH 3/5] debian/control.stub: add arm64 linux-image-uc22-lowlatency Date: Tue, 8 Feb 2022 15:50:40 +0000 Message-Id: <20220208155042.273128-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208155042.273128-1-dimitri.ledkov@canonical.com> References: <20220208155042.273128-1-dimitri.ledkov@canonical.com> 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" Add a lowlatency UC22 kernel package for arm64, currently unsgined. Signed-off-by: Dimitri John Ledkov --- debian/control.stub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index d524b69909..7e35a32805 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -17,8 +17,8 @@ Description: UC22 kernel image generic Canonical's UEFI signing key on amd64. Package: linux-image-uc22-lowlatency -Architecture: amd64 -Depends: linux-firmware, wireless-regdb, linux-modules-@ABI@-lowlatency +Architecture: amd64 arm64 +Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-lowlatency [arm64], linux-modules-@ABI@-lowlatency Description: UC22 kernel image lowlatency A kernel image for lowlatency UC22. This version of it is signed with Canonical's UEFI signing key on amd64. From patchwork Tue Feb 8 15:50:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=N8e3zvZo; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtSD26Rj4z9s0r for ; Wed, 9 Feb 2022 02:51:14 +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 1nHSlk-0004hR-Cw; Tue, 08 Feb 2022 15:51:04 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHSlh-0004cF-NP for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 15:51:01 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 24CDA3F324 for ; Tue, 8 Feb 2022 15:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644335460; bh=A5ELJtWbGmBzdtymvDZyPwj6KW7K8nvOIRGdmwMUaxI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N8e3zvZoJZoffIpN8VrqkPSx3P63ZjqaacQJWnxrDk7ipNVKBfjSfFvEsT62dy54E LRCWYOfmtpn48oDfqmWUF6vsgyX/E7kRH06UR9xklLaTeRsmSCbFc+ZfNhFGokejW0 w1+/LAEtpOVwsaq7L8fgYYjTIzCC+7OEM+NhAWNk5R3dNjk2aWbEsUdb8qG3cnzDu4 AQl18uHxkDgh+Rb3SLUE1MZwTXNwx6FLJj69GATooTKk1RCOxJTit/QzJXTSg9Bptf eO8NZnq6ivHsiE97qaFj3jB+jHe8+I/DaLBO/NMFoEuXuqJJXUMAVXWXYMRqgl/13Z EVlCqu4MPIQJw== Received: by mail-ej1-f71.google.com with SMTP id ka12-20020a170907990c00b006c41c582397so4423847ejc.11 for ; Tue, 08 Feb 2022 07:50:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A5ELJtWbGmBzdtymvDZyPwj6KW7K8nvOIRGdmwMUaxI=; b=ouPCdkfRRveZOvEJCURnazLW85YHLtAiz9ytKyO59n4R41ERpNY2Mi5kSi4X+RCyzL 1tSwm0gA7GHKtDmll5OZG31ayvuq3Nr0MgskIki6VLfZgXIsNL4fpt3HmhPOZ9FrL6+J rV47s/EbHtKYZQ6AgVpdueLitDk17/arC7pdnff2VtdhoT138es3TVfV99KuUZblne4D WvpMv0TwQFeozL+1rfmwjirqgEW3csQM0698U51ULk4XYxVIH7Z3/Gy/mhc8IAmju/PR 6vSrYyh860urUcOxW/Bq1ZJbLFNNSCmAHtN5EBY2R5BQyHCOq3rKtaJXisYYNyauw6Fo HShQ== X-Gm-Message-State: AOAM531wKYc35FD+mmdM/VIDHW1RlMDyjA+awrn4MN0VMRS71BINLvn4 LP+1/bJod7N3hBQaFqhhOFktpU/tK8zTM6TL/noaJSzJDdyFLvzDtMtIfln8SEpMpFbY8t0xxdo 6bgr491dbYnAp6uXoHk6i1aHtrrw1MHvMNikzr6u3GQ== X-Received: by 2002:a17:907:86a8:: with SMTP id qa40mr4161496ejc.453.1644335457842; Tue, 08 Feb 2022 07:50:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwide+fvIqpXFegWhx+AHzwjgEwj3kkjL9qyMuaeSyKP3f7rwgLUhisSU4r3FN89ULlcHZ01g== X-Received: by 2002:a17:907:86a8:: with SMTP id qa40mr4161479ejc.453.1644335457570; Tue, 08 Feb 2022 07:50:57 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id gq1sm4025621ejb.58.2022.02.08.07.50.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 07:50:57 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][linux-signed-uc22][PATCH 4/5] debian: provide stampfile of UC22 kernel image type Date: Tue, 8 Feb 2022 15:50:41 +0000 Message-Id: <20220208155042.273128-5-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208155042.273128-1-dimitri.ledkov@canonical.com> References: <20220208155042.273128-1-dimitri.ledkov@canonical.com> 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" Provide stamp files in /usr/share/doc/$(package) that indicate whether this UC22 kernel is expected to be snapped as kernel.efi or vmlinuz. It is usually non-obvious which way a given architecture should be snapped, current architectures support both types on many arches, and some will be switched during UC22 cycle from vmlinuz to kernel.efi. Providing these stamp files will allow snapcraft.yaml to correctly build kernel snaps when kernel image type is changed. Signed-off-by: Dimitri John Ledkov --- debian/kernelefi.stamp | 2 ++ debian/linux-image-uc22-generic.docs.amd64 | 1 + debian/linux-image-uc22-generic.docs.arm64 | 1 + debian/linux-image-uc22-generic.docs.armhf | 1 + debian/linux-image-uc22-lowlatency.docs.amd64 | 1 + debian/linux-image-uc22-lowlatency.docs.arm64 | 1 + debian/vmlinuz.stamp | 2 ++ 7 files changed, 9 insertions(+) create mode 100644 debian/kernelefi.stamp create mode 100644 debian/linux-image-uc22-generic.docs.amd64 create mode 100644 debian/linux-image-uc22-generic.docs.arm64 create mode 100644 debian/linux-image-uc22-generic.docs.armhf create mode 120000 debian/linux-image-uc22-lowlatency.docs.amd64 create mode 120000 debian/linux-image-uc22-lowlatency.docs.arm64 create mode 100644 debian/vmlinuz.stamp diff --git a/debian/kernelefi.stamp b/debian/kernelefi.stamp new file mode 100644 index 0000000000..1c3ac9f3fc --- /dev/null +++ b/debian/kernelefi.stamp @@ -0,0 +1,2 @@ +# This file indicates that this architecture of UC22 kernel uses +# kernel.efi to boot. diff --git a/debian/linux-image-uc22-generic.docs.amd64 b/debian/linux-image-uc22-generic.docs.amd64 new file mode 100644 index 0000000000..59e9ea2858 --- /dev/null +++ b/debian/linux-image-uc22-generic.docs.amd64 @@ -0,0 +1 @@ +debian/kernelefi.stamp diff --git a/debian/linux-image-uc22-generic.docs.arm64 b/debian/linux-image-uc22-generic.docs.arm64 new file mode 100644 index 0000000000..3526faaa4d --- /dev/null +++ b/debian/linux-image-uc22-generic.docs.arm64 @@ -0,0 +1 @@ +debian/vmlinuz.stamp diff --git a/debian/linux-image-uc22-generic.docs.armhf b/debian/linux-image-uc22-generic.docs.armhf new file mode 100644 index 0000000000..3526faaa4d --- /dev/null +++ b/debian/linux-image-uc22-generic.docs.armhf @@ -0,0 +1 @@ +debian/vmlinuz.stamp diff --git a/debian/linux-image-uc22-lowlatency.docs.amd64 b/debian/linux-image-uc22-lowlatency.docs.amd64 new file mode 120000 index 0000000000..39896b1b12 --- /dev/null +++ b/debian/linux-image-uc22-lowlatency.docs.amd64 @@ -0,0 +1 @@ +linux-image-uc22-generic.docs.amd64 \ No newline at end of file diff --git a/debian/linux-image-uc22-lowlatency.docs.arm64 b/debian/linux-image-uc22-lowlatency.docs.arm64 new file mode 120000 index 0000000000..4387357538 --- /dev/null +++ b/debian/linux-image-uc22-lowlatency.docs.arm64 @@ -0,0 +1 @@ +linux-image-uc22-generic.docs.arm64 \ No newline at end of file diff --git a/debian/vmlinuz.stamp b/debian/vmlinuz.stamp new file mode 100644 index 0000000000..d2ada6ddf9 --- /dev/null +++ b/debian/vmlinuz.stamp @@ -0,0 +1,2 @@ +# This file indicates that this architecture of UC22 kernel uses +# vmlinuz to boot. From patchwork Tue Feb 8 15:50:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=a5dWLFa2; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtSD21QPbz9s0B for ; Wed, 9 Feb 2022 02:51:14 +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 1nHSlj-0004gM-Kn; Tue, 08 Feb 2022 15:51:03 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHSlh-0004cv-R4 for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 15:51:01 +0000 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 514D83F32B for ; Tue, 8 Feb 2022 15:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644335460; bh=ku+Q+v634fh44HMTmjDbnCNAoZk7HKjuK2RkXg3robM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a5dWLFa2vpA/D91itHWVItDwvTb9QeNXoCtVYHkkp2iHYmks3oPO3/rnUdiqo/euU MHyGaCNMzG4O5pFk5d+usIokw2EeleKvQfPAho/ao6QU75sPYcB5WAgDcHZTn860XS bU1vveQGsXTSg5P63xfHketxSKRXMC+Dm62F6uoMiQTqJSvOvpFdzCq64swb2UBPcr jQku9HNDXNl19+DwkSmqe/qA2k3dkU0QNWd7C8m0/bWCFkprDYYYrNKVCa/+oFRP+y icWFE8T9VS077RmGr8KJZYxcqmz/iGR9YZjOK4aH571qSCYT1N05L+dWJyxXFKIUWR +sCQ84i7+pkRw== Received: by mail-ed1-f72.google.com with SMTP id q11-20020a5085cb000000b0040f7eceaf7aso3246587edh.14 for ; Tue, 08 Feb 2022 07:51:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ku+Q+v634fh44HMTmjDbnCNAoZk7HKjuK2RkXg3robM=; b=VEPlTs7A1MAPRwoJk5rp0qxt5zDN9r5Z7GQJnVYghzg04wXulnFvkHfbuhuruxoBm+ FPdTwQkTQXh6OHigkG3nl2jgwABdyB/GpUVx926ZzCMz3++/wZnZC7pezDtQZK+sOHea BVqphh+iLwzgDYsKEVEKHqSRAdfhyIYbgqXtpUxIC6BP7Te5Ee/LJp1xJDqev+0/z2VX ruwKdjn9sQVPUReLzoow8MUOWcT+jUCZNrvt2bpqHHAgUgFxsQcMRSW5eJYqJt/ccec9 7/vXd3AdWczfCThQkM+sNFAYlcvik+RcL9BfEyO4LSZM2nu951roNNpt3TrWeeadYDE5 fQqQ== X-Gm-Message-State: AOAM53337w0U83qfBOv3elnnDQPu7IP63LLN7o+jYhNJNawLE5Ti4xcA XxRnaDqmrupO1jvEaTzDlLASEr8Gdbp5qkdO3DR53QvrTZIrorfz/Y23RqCfk3Z7olIG4XEkdJH 0yLdJxx91NBtWmdhPrCDYdpqTT4mDwib5cO0C4BuDcw== X-Received: by 2002:aa7:d059:: with SMTP id n25mr5274796edo.106.1644335458978; Tue, 08 Feb 2022 07:50:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhZAYe0jt8t2x3NtYKytViZ5EVvB3Dv3nzcAvbm0Okv0GgITYWRqRqjn3rYA9hoJgUxOv2ow== X-Received: by 2002:aa7:d059:: with SMTP id n25mr5274781edo.106.1644335458735; Tue, 08 Feb 2022 07:50:58 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id g2sm6959080edt.44.2022.02.08.07.50.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 07:50:58 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][linux-signed-uc22][PATCH 5/5] debian/control.stub: depend on abi specific nvidia objects and signatures Date: Tue, 8 Feb 2022 15:50:42 +0000 Message-Id: <20220208155042.273128-6-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208155042.273128-1-dimitri.ledkov@canonical.com> References: <20220208155042.273128-1-dimitri.ledkov@canonical.com> 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" For kernel snap, only objects and signatures are needed to be staged in the snap, for the matching abi of the kernel. During snap build using adopt-info key, snapcraft.yaml doesn't know which abi it is building kernel.snap for (as it might be embargoed), thus encode the abi of nvidia objects in the control.stub. Note that the top-level meta which pulls in -common- packages is not needed in the kernel snap, te -common- things are staged into nvidia-assemble snap. Signed-off-by: Dimitri John Ledkov --- debian/control.stub | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index 7e35a32805..e728319439 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -11,14 +11,18 @@ Standards-Version: 3.9.4 Package: linux-image-uc22-generic Architecture: amd64 arm64 armhf -Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-generic [arm64 armhf], linux-modules-@ABI@-generic, linux-modules-extra-@ABI@-generic +Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-generic [arm64 armhf], linux-modules-@ABI@-generic, linux-modules-extra-@ABI@-generic, + linux-objects-nvidia-470-server-@ABI@-generic [amd64], + linux-signatures-nvidia-@ABI@-generic [amd64], Description: UC22 kernel image generic A kernel image for generic UC22. This version of it is signed with Canonical's UEFI signing key on amd64. Package: linux-image-uc22-lowlatency Architecture: amd64 arm64 -Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-lowlatency [arm64], linux-modules-@ABI@-lowlatency +Depends: linux-firmware, wireless-regdb, linux-image-@ABI@-lowlatency [arm64], linux-modules-@ABI@-lowlatency, + linux-objects-nvidia-470-server-@ABI@-lowlatency [amd64], + linux-signatures-nvidia-@ABI@-lowlatency [amd64], Description: UC22 kernel image lowlatency A kernel image for lowlatency UC22. This version of it is signed with Canonical's UEFI signing key on amd64.