From patchwork Fri Sep 16 11:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1678648 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=Bx7NLjF8; 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 4MTXmk1fc8z1ynm for ; Fri, 16 Sep 2022 22:04:22 +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 1oZA4u-0006NW-0w; Fri, 16 Sep 2022 12:04:16 +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 1oZA4s-0006NK-Dy for kernel-team@lists.ubuntu.com; Fri, 16 Sep 2022 12:04:14 +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 33C843F337 for ; Fri, 16 Sep 2022 12:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663329854; bh=XNawu6CszRp4L30PEK+H+iWS5+buw/cVPIU5+D0zhsM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Bx7NLjF8M/GkzhHIpIf36Td5bKJidDNT56QvY5qjpIqwpqobdXnvDkY3p1y8X60cP ARF7s7tzw13f/xV3pdP6MQ+zNdBAA35PR2nJlGdNOjKIv87sfafyFIvzfBY4ZTPVeO Ry+A6ZTymZmOCjkFkE3saqCKe24v/v/OTWsUVjgvrrFBhvhSNUr85mwKFGPknD9iOD EM5tHbxeOsiG0WxmXKyiDU3UV8kBtIym32DQMHn0BY0/WxVqP+gMHCeMhH1fY9pd6b 10+PSQZOQTUCRnnEVAdqNa6I7HkYF6bikltfYuGuS3GhsV29A73MoRRX90hUINzR1q /zB5xPAiqFtXA== Received: by mail-ej1-f71.google.com with SMTP id nc18-20020a1709071c1200b00780b046fb4eso625402ejc.22 for ; Fri, 16 Sep 2022 05:04:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=XNawu6CszRp4L30PEK+H+iWS5+buw/cVPIU5+D0zhsM=; b=KB74Ugl62yzk8lN/uXYHPK9a22h0ve3e1bmfHyLir8+oLI0bcek2jcazN9bhfTCtEl p9s7drZT7R4ncl7XO/d0XC5kiWFT6AHVZSCAc8U6SQbszePquUVM4sb+eiW3XibkORsP hHtsfT0iCVzUcANLks6kbOTnk6Y5IEvBd3hBfNBqPnLVh+7j5Im2MLvfytxfhBpsAnBV nA3zVQCnfr0gTdZOOCaRH9zYlTawfuxTgjihoiCHqq/QxecdAtKTgXZLkOZFG9VpuZDL nFL1vUa9ZF7wCNxbp+SjrS4PGaYXdPtS8c0V1rkDx2m7ukwYhkkprC3twhv5TnjrB081 wbOg== X-Gm-Message-State: ACrzQf1Q7MGPUf9PS5jB50GvxnlcIgajvreQyh8vOX8cdcj03mT4pPfK eAr/mK1B5AKjF/6n6+uUlJAD53swZGgvjDn9i73fG7Q3vclrj2AlwZlHvNwGGrljkQOfFZ4FqH1 HRamrcx6lzTOCcQjKWNjqEKK53P61xGFdGEgvkAabJg== X-Received: by 2002:a17:907:3e07:b0:774:53ba:6b27 with SMTP id hp7-20020a1709073e0700b0077453ba6b27mr3177515ejc.286.1663329853317; Fri, 16 Sep 2022 05:04:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7w4Li5PSEiY+mhi15UUtkC4RFfSWe8c/VBxH4frAkvIYaUznU2h5S6a6EMxPkPolc8e2VGXw== X-Received: by 2002:a17:907:3e07:b0:774:53ba:6b27 with SMTP id hp7-20020a1709073e0700b0077453ba6b27mr3177503ejc.286.1663329853120; Fri, 16 Sep 2022 05:04:13 -0700 (PDT) Received: from localhost (host5-81-229-118.range5-81.btcentralplus.com. [5.81.229.118]) by smtp.gmail.com with ESMTPSA id fq32-20020a1709069da000b00770812e2394sm10286187ejc.160.2022.09.16.05.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 05:04:12 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 07/13] UBUNTU: [Packaging] generate: only produce -di package configuration when present Date: Fri, 16 Sep 2022 12:46:36 +0100 Message-Id: <20220916114642.2953019-8-apw@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220916114642.2953019-1-apw@canonical.com> References: <20220916114642.2953019-1-apw@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: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index b073323..711b749 100755 --- a/debian/rules +++ b/debian/rules @@ -81,8 +81,10 @@ override_dh_auto_install: verflav="$(abi)-$$flavour"; \ \ package="kernel-signed-image-$$verflav-di"; \ - echo "$$package: adding $$signed"; \ - echo "$$signed boot" >>"debian/$$package.install"; \ + if grep -q "^Package: *$$package\\$$" debian/control; then \ + echo "$$package: adding $$signed"; \ + echo "$$signed boot" >>"debian/$$package.install"; \ + fi; \ \ package="linux-image-$$verflav"; \ echo "$$package: adding $$signed"; \