From patchwork Thu Aug 24 14:30:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1825427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=qbQaWyhw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RWlrT3r1tz1yh2 for ; Fri, 25 Aug 2023 00:31:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qZBMe-0007Tc-1P; Thu, 24 Aug 2023 14:31:12 +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 1qZBMY-0007Sb-Ti for kernel-team@lists.ubuntu.com; Thu, 24 Aug 2023 14:31:06 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.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 B66F23F32D for ; Thu, 24 Aug 2023 14:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1692887466; bh=n9ciAAzF/LfGSE7o04ukuWFXFQzSBHyRFCTbfJ1kAV0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qbQaWyhwvAhIJbZ0sLbJZMtsNgP4gcw/g/awlVfGrzUn8c4RKcGiqRtnY3PMN6OPK LQhp6lb5Qr/xHdQq4fow5K9u3yoiI/+ZdKMRINVGgx9MtgQXe86iJML+ZwH14oCQ8K GUcL0yWRSNBOV9qJsxC12DCe5+6+1iPcPdI/FqgXJ6gtVUPA2wRHi9/tg9VxVkIAXg TsGh6YJcvt8Tf52jK2PfBMxF3ue8uzn4tNRt53M8tSaNIjhczDHRz7f5qYpAbdpRJ5 d99Eawf7pgFMqGYrTtU1+JJk+pDPoU9Rvak7uquE9/SA2cum7+2ZFPNLbR95daTpIJ v/Q/UPhm7i8xg== Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-31c5adb698aso2723884f8f.2 for ; Thu, 24 Aug 2023 07:31:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692887466; x=1693492266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n9ciAAzF/LfGSE7o04ukuWFXFQzSBHyRFCTbfJ1kAV0=; b=YGaNlLRJS7Mj4lMcV9uJdHagF9SsFKHfaL15m9jQbqz8rSwbqkyHEx6eP6x8k/ej+L AOKhpDhc4G1iM3jkITgNAmJW0vI1zmnRtj/fn63aQxyLu/WlmkXUrWFmoY2CN/lI2aG1 F5lMIutinQfh34hCnEHOlRCXCeH2Dhy+j2ufa7yEQajfA9OnVehA25r1VQHgjI2JdKnT eN2tu3eH9LG4zDDRhObW4vhRBGjiwqjeTXykIPoX6JqNCALxn1yEFBxol3qtGMVAD+2T oovtXe0G6gQsXtm/VicQQ8efUKn2DT2ab6yZxskhAqn+ct45xh8BjV0u8llRiBnwCFjX euJg== X-Gm-Message-State: AOJu0YyAzlUBolj/pFQmqh8bxjULCHO2Dzlz2i3dlrWUpQlpV0S8T6jF 4jIrhe/cRiRXDUlj9jB/oBNbO7+96fOJllA0L2HYOWhLtkFPdLXPTnQf60TvWgdSnmggf10y6WR pcnysCzGJ2TYHfFyLyzrMc15sivFFZTnoVrv+0MDKv8Oh2zXMzU+TDkg= X-Received: by 2002:a05:6000:4e:b0:319:7428:9caa with SMTP id k14-20020a056000004e00b0031974289caamr12151638wrx.38.1692887466223; Thu, 24 Aug 2023 07:31:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHttwb+YyM1/MQEsTS5HYgNgJrnm2tpI4sj/vwRMRjyxHkWOqcaGorj3J26M41y3XJ4OXpbDw== X-Received: by 2002:a05:6000:4e:b0:319:7428:9caa with SMTP id k14-20020a056000004e00b0031974289caamr12151628wrx.38.1692887465892; Thu, 24 Aug 2023 07:31:05 -0700 (PDT) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id b8-20020a5d4d88000000b0031c6cc74882sm5156781wru.107.2023.08.24.07.31.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 07:31:05 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: [Packaging] Add support to build-depend on modules-extra Date: Thu, 24 Aug 2023 15:30:59 +0100 Message-Id: <20230824143100.2591518-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824143100.2591518-1-dimitri.ledkov@canonical.com> References: <20230824143100.2591518-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" linux-generate for kernel.efi builds may require modules-extra for some flavours and arches. Add support to request such build-depends for linux-generate. BugLink: https://launchpad.net/bugs/2032760 Signed-off-by: Dimitri John Ledkov --- debian/scripts/config.py | 6 +++++- debian/scripts/generate-control | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/scripts/config.py b/debian/scripts/config.py index 0fc94c1676..9ef880c773 100644 --- a/debian/scripts/config.py +++ b/debian/scripts/config.py @@ -9,10 +9,14 @@ class Signing: for flavour in flavours: self._arch_flavour_data.setdefault((arch, flavour), set()).add((stype, binary)) self._flavour_to_arch.setdefault(flavour, set()).add(arch) - # cvm is an exclusive option: no image paragraph, no further option flags + if "extra" in options: + # cvm & uc sometimes need modules-extra + self._package_to_flavour_to_arch.setdefault("extra", {}).setdefault(flavour, set()).add(arch) + # cvm is an exclusive option: no image paragraph if "cvm" in options: self._package_to_flavour_to_arch.setdefault("cvm", {}).setdefault(flavour, set()).add(arch) continue + # uc is an exclusive option: no image paragraph if "uc" in options: self._package_to_flavour_to_arch.setdefault("uc", {}).setdefault(flavour, set()).add(arch) continue diff --git a/debian/scripts/generate-control b/debian/scripts/generate-control index 5945d9c965..0661b61e34 100755 --- a/debian/scripts/generate-control +++ b/debian/scripts/generate-control @@ -26,6 +26,9 @@ with open("debian/control.stub") as tfd, open("debian/control", "w") as cfd: uci_archs.update(archs) if uci_archs: print(f' ubuntu-core-initramfs [{" ".join(uci_archs)}] ,', file=cfd) + for flavour, archs in signing.package_flavour_archs("extra"): + # ubuntu-core-initramfs sometime needs extra modules https://bugs.launchpad.net/bugs/2032760 + print(f' linux-modules-extra-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(archs)}] ,', file=cfd) print(f" {generate_name} (= {source_version}),", file=cfd) efi_archs = set() for (arch, flavour), (stype, binary) in signing.arch_flavour_data: @@ -99,12 +102,16 @@ with open("debian/control.stub") as tfd, open("debian/control", "w") as cfd: Canonical's signing key. """).rstrip(), file=cfd) for flavour, archs in signing.package_flavour_archs("uc"): + depends = "linux-modules-{abi_version}-{flavour}" + for extra_flavour, extra_archs in signing.package_flavour_archs("extra"): + if extra_flavour == flavour: + depends += f", linux-modules-extra-{abi_version}-{flavour} [{' '.join(extra_archs)}]" # Mostly similar to image, but we don't have recommands nor conflicts print(dedent(f"""\ Package: linux-image-uc-{abi_version}-{flavour} Architecture: {" ".join(archs)} - Depends: linux-modules-{abi_version}-{flavour} + Depends: {depends} Built-Using: {unsigned_name} (= {unsigned_version}) Description: Signed kernel image {flavour} for Ubuntu Core A kernel image for {flavour}. This version of it is signed with From patchwork Thu Aug 24 14:31:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1825429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=Y64YLzoH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RWlrT3YPyz1ygJ for ; Fri, 25 Aug 2023 00:31:20 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qZBMh-0007Vv-8y; Thu, 24 Aug 2023 14:31:15 +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 1qZBMb-0007Sv-8t for kernel-team@lists.ubuntu.com; Thu, 24 Aug 2023 14:31:09 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.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 13FBD3F32D for ; Thu, 24 Aug 2023 14:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1692887469; bh=fxzOqM+cjQF+obRvE9otr7kuKc0lNrBXvMnGxst7Cgw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y64YLzoHwgPLRqECtreFMe3/EYUsqiXjii3qk3LC91FmjKwwGcwNU0AaoiNPm8AEh DC7RYI+bKBiUtuV//HWNwbDs7vMVM9yEdwxyrLUrNSalbptZe8p5GwfhQGHsg2Z6MO MsTaRqJ2PtNaops6xHJCKfvex5uv9AEwJrBNBkFVqWwlu/ULUnLUDKilAVs2fofD4V uix+fxLdZR7aWKf+/DUG+5bR2nBgalayA61wq5cFZCP8Z2+dtHqhSXatJKKIonYqnO KSUZc5NLjCSlLXkNNNoquFOKyQUIGwxxlHvq9J3LK78TVp+I7DcC5GE3BDLvVK7rr6 OeHX6W34Y1JVQ== Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-31c6c275c83so1336888f8f.2 for ; Thu, 24 Aug 2023 07:31:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692887468; x=1693492268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fxzOqM+cjQF+obRvE9otr7kuKc0lNrBXvMnGxst7Cgw=; b=dvE3Hvq3tmbSIfifp/+iUROj0hHcgELZ6TdHcXlAF1kZGP7veVd/gC7QDhKwYSce9K 0SeOr4l1b57P4oTa3KG07BYfZveIDZusF0VpeD6P57Syv34jMlGst1TxSdUUJ4c3ObBa oDpUuwHWe3Hf97Xt6kn3hZRftF7bCiG7mOtXeuQ7wRm85beEDVmcSlomup4e4F8dE8fY g/Dm8ScsP4bhnA2+BLxrFSDNXZKBQf69cuNZwCISr4s4isfgD5ntpdjNq1NW9HSHAITO StSUCstBlJ4fJXwHFd+V1HUH/D6In45wFyCGc8TqgK/Y/ZSLu3C4Nn/vXMrII8FLQNNx s7Hg== X-Gm-Message-State: AOJu0YxlHAiAzoIWkh2ELG7c495aDY5x7cvUJsKsxFPqQWBBkvJuib6G 87Gf/9SLqoA7CbVIFe16FoAbYYIi4cd3rPTNiQQAckOerAe8ApJ0Km55M91RMKa/n53OSGzE4ZL 3cMiNv3vvLPM/IFg2/5OTQcuS5/ofYYYrCTO/ab1Bcmurrajtra1H+0U= X-Received: by 2002:a7b:c8c8:0:b0:401:b204:3b95 with SMTP id f8-20020a7bc8c8000000b00401b2043b95mr616013wml.15.1692887468574; Thu, 24 Aug 2023 07:31:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFi14WG6PETban92wfuqo1ZANYI7VnLk5dtJYI1o8kNSVO5G/kQxcQDuUZyC2BjB+VPwk/Ng== X-Received: by 2002:a7b:c8c8:0:b0:401:b204:3b95 with SMTP id f8-20020a7bc8c8000000b00401b2043b95mr615998wml.15.1692887468223; Thu, 24 Aug 2023 07:31:08 -0700 (PDT) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id f2-20020a7bcd02000000b003fba6a0c881sm2830133wmj.43.2023.08.24.07.31.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 07:31:06 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Packaging] Request modules-extra on kernel.efi builds Date: Thu, 24 Aug 2023 15:31:00 +0100 Message-Id: <20230824143100.2591518-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824143100.2591518-1-dimitri.ledkov@canonical.com> References: <20230824143100.2591518-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" Request build-depends to pull in modules-extra for kernel.efi builds that have modules-extra (generic X amd64/arm64, non-64k one). BugLink: https://launchpad.net/bugs/2032760 Signed-off-by: Dimitri John Ledkov --- debian/package.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/package.config b/debian/package.config index 32d71631a6..daf928e92c 100644 --- a/debian/package.config +++ b/debian/package.config @@ -1,6 +1,6 @@ sign amd64 efi vmlinuz generic -sign amd64 efi kernel.efi generic --uc +sign amd64 efi kernel.efi generic --uc --extra sign arm64 efi vmlinuz generic -sign arm64 efi kernel.efi generic --uc +sign arm64 efi kernel.efi generic --uc --extra sign arm64 efi vmlinuz generic-64k sign arm64 efi kernel.efi generic-64k --uc