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.