From patchwork Mon Jun 12 10:50:30 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: 1793862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=Aya3mRL9; dkim-atps=neutral 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 4QfpPb2yg0z20Wl for ; Mon, 12 Jun 2023 20:50:43 +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 1q8f89-0004vM-FE; Mon, 12 Jun 2023 10:50:37 +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 1q8f87-0004vF-14 for kernel-team@lists.ubuntu.com; Mon, 12 Jun 2023 10:50:35 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id CC70E3F36B for ; Mon, 12 Jun 2023 10:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1686567034; bh=Lnt8ZLPHgs826ilrBtIGPiw5hQuRxH6eP2JLCmRJQTs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Aya3mRL9xFLT7pH/3A8sw8t6rjQqJbHUTiWqvuem/ZzL1zBPvd+/R2rvhQZ3xaVo+ qXm0yvdOWDKM51ZYZzatvoRePXuHiC5kKI3lyTMKFDvj/ISIQuqjEt19Ghz9+t/KhF vzmredxg0ykns9sJEhbeNoyFX0w/gSyaiVJdTJuX4r+vwiPZwyLTrODNXaltP6eBk0 wOzS10z2dNE28JX7dIZI2oUusblug8GbNjhVaGATYogiR7taa1FvyNW5ZqXWnSyLDt akFFS+1QtDEm0L09m0DH6lVo8YbxGIJyaTpxhGrybhPLmQhS1ZwFEWBCmHRUDpc/r2 uNwgThbfvz4UQ== Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f814f78af2so6382055e9.0 for ; Mon, 12 Jun 2023 03:50:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686567033; x=1689159033; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Lnt8ZLPHgs826ilrBtIGPiw5hQuRxH6eP2JLCmRJQTs=; b=TaGC0CoB87H2IPNoP4lYaxmOKum0XWPMCtnMiFLGTnra+eXGALpNaTeG4h80quRe/J cWVu4B0bjeftgnriwZ3BHjCktjhMX2xsaebCAdftc94urIYrqyOrlNf+GiODtdiRCLpI 3/yPEau+jsifssp96DBewoI5lnEnce3hqkgasHueKE2vt7WO48NVu8TTdq2kT3vIDzps d2WF63I6UX1Y9xcZ3wF5HpvNoDB/Hi+3E0sVax+sj3K4a1om6Z2D9k0/Z/Ha2Ds5qyM1 TcTnin8Y1QzBabZzSHRtjK/kigtDaER0XzYpPep9CMW6ZobqWY8WzUQTb7oxweU+8L3z tdcQ== X-Gm-Message-State: AC+VfDzv7ZkOmSj00FNQYGP8MIkncXLrtF8ABGC0kgpBP1BSwsSdZRVg Uv5IQghWwgdP1UKGwj5a6rgcfY4JBW9FFj3x8BQqc6Xy8Kh1LBI5GpdqzXMvt1SQ/yVU14MQNbE 4C8pil8FBIdsVoQ53U5Av6JVhD4M3HzyujRxf6M+SMwwArbegvA== X-Received: by 2002:a05:600c:364f:b0:3f6:d09:5d46 with SMTP id y15-20020a05600c364f00b003f60d095d46mr5385559wmq.20.1686567033315; Mon, 12 Jun 2023 03:50:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/yEPJniBmWfTR4RT2T+jWYJbcBulrd2rVC0hEVpMkAFpiaRajwTspNf3AElOuNqtOqjjMBQ== X-Received: by 2002:a05:600c:364f:b0:3f6:d09:5d46 with SMTP id y15-20020a05600c364f00b003f60d095d46mr5385546wmq.20.1686567033006; Mon, 12 Jun 2023 03:50:33 -0700 (PDT) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id p14-20020a7bcc8e000000b003f727764b10sm11135496wma.4.2023.06.12.03.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 03:50:32 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [mantic:linux][mantic:linux-unstable][PATCH] UBUNTU: [Packaging] remove the signing tarball support Date: Mon, 12 Jun 2023 11:50:30 +0100 Message-Id: <20230612105030.2242300-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.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: , Cc: apw@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" All signing tarball support is now removed (previously only disabled) as all kernels now use generate out of linux-signed to submit signing. Fixes: 6fecc30361 ("UBUNTU: [Packaging] neuter the signing tarball") BugLink: https://bugs.launchpad.net/bugs/2012776 Signed-off-by: Dimitri John Ledkov --- debian/rules.d/2-binary-arch.mk | 35 --------------------------------- 1 file changed, 35 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b796e67dad..8ab795a5d9 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -157,32 +157,6 @@ else $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* chmod 600 $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* endif - -ifeq ($(uefi_signed),DISABLED) - install -d $(signingv) - # gzipped kernel images must be decompressed for signing - if [[ "$(kernfile)" =~ \.gz$$ ]]; then \ - < $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - gunzip -cv > $(signingv)/$(instfile)-$(abi_release)-$*.efi; \ - cp -p --attributes-only $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - $(signingv)/$(instfile)-$(abi_release)-$*.efi; \ - echo "GZIP=1" >> $(signingv)/$(instfile)-$(abi_release)-$*.efi.vars; \ - else \ - cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - $(signingv)/$(instfile)-$(abi_release)-$*.efi; \ - fi -endif -ifeq ($(opal_signed),DISABLED) - install -d $(signingv) - cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - $(signingv)/$(instfile)-$(abi_release)-$*.opal; -endif -ifeq ($(sipl_signed),DISABLED) - install -d $(signingv) - cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - $(signingv)/$(instfile)-$(abi_release)-$*.sipl; -endif - install -d $(pkgdir)/boot install -m644 $(builddir)/build-$*/.config \ $(pkgdir)/boot/config-$(abi_release)-$* @@ -840,17 +814,8 @@ ifeq ($(do_cloud_tools),true) endif .PHONY: binary-debs -binary-debs: signing = $(CURDIR)/debian/$(bin_pkg_name)-signing -binary-debs: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision) -binary-debs: signing_tar = $(src_pkg_name)_$(release)-$(revision)_$(arch).tar.gz binary-debs: binary-perarch $(addprefix binary-,$(flavours)) @echo Debug: $@ -ifeq ($(any_signed),true) - install -d $(signingv)/control - { echo "tarball"; } >$(signingv)/control/options - cd $(signing) && tar czvf ../../../$(signing_tar) . - dpkg-distaddfile $(signing_tar) raw-signing - -endif build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-install-,$(flavours))