From patchwork Fri Sep 16 11:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1678643 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=gB1aa4rW; 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 4MTXX76Grrz1ynm for ; Fri, 16 Sep 2022 21:53:27 +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 1oZ9uL-0002H8-Pr; Fri, 16 Sep 2022 11:53:21 +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 1oZ9uK-0002Gz-EL for kernel-team@lists.ubuntu.com; Fri, 16 Sep 2022 11:53:20 +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-0.canonical.com (Postfix) with ESMTPS id C10FE3F147 for ; Fri, 16 Sep 2022 11:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1663329199; bh=Tuqswbipbeg4NAwSI3J0HJaxhR5H19xWdVlJ7wBNIsQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gB1aa4rWii6Xoh/aqWYnaeEQ78UItMezpkLwFtX280K6+8eyLiM9eXYKtCc4AHmlz PLoL5Ue2nWSs/UNkY+ensISBp1gspTJXixPcRXup7VWBFcfa1w3jfW9WNv4OrLa22P Kbw+nFUfyPv2xyYuECJ93LrPTH05nnSLf1BCVIPoivh429JcEUJ25Mo+1Y4y6NP+dB wPHSwvktSwdTk/iWmKGFgp2gkBvt2zkovkE+9W6GZXkoipKq1QH504Hm7IQqaKc/Gs zqWEY6K63vUoasBo2/mI26uqmhe5DWDyokyC32B7hSZRqDukJy8U0lrW8pUY3Or+r2 DcIiLl0NG+IXg== Received: by mail-wm1-f69.google.com with SMTP id c5-20020a7bc005000000b003a63a3570f2so7650057wmb.8 for ; Fri, 16 Sep 2022 04:53:19 -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=Tuqswbipbeg4NAwSI3J0HJaxhR5H19xWdVlJ7wBNIsQ=; b=itRjALWBYaiJZTDPMX7cjsmESbJqMBZ3hulDU9rjcvuKii77qmEO2CcXB0Psm+6J6e 9awTOCN4m9zhHcUR0Dpm+3cc0oYyPHm4n7UaJG3YajHVetULKTvqBc/oEK+SjWoaTNcz zcXtDGtsrMqA4+cGPZhPj8A+08+LD6iiHtU+abk3hR3ZelHMYzqqUFYlMT5QwwN4Oo55 JFDwys/fQMO15xGo6tqapFCBkvUIUR1uVKlpXFi/3FewKYImFdmd8i0uZ5YS2E9amXit LCRzZZqOqfc/ykjw6rtymmoYz8kLtH953KxnJbNl4VAwc4jYFFnwmmcpIT1L6AeM4m0h HPqQ== X-Gm-Message-State: ACgBeo3LsL2KSKW5OpD1VEFvT3aNPYXzC1IZTKsAtfvfrM/hfq0E36po riJEzQ4W8m/Zxc5TBN5n6tpPR/KiTNFcXWyj3Vo9l+vV1y6CsgqnVo4EFtA9g35huY1HFmLlw6F PP4Sg1erbo7aShwAYgabhWFU3cVQ6ZMw+kzrQDWtIsQ== X-Received: by 2002:a05:600c:216:b0:3b4:874c:61e6 with SMTP id 22-20020a05600c021600b003b4874c61e6mr10203667wmi.116.1663329197961; Fri, 16 Sep 2022 04:53:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR5zQYtG/FmNFPI6f0pifELPrFvtq1kQ8LUY+z9r6nhiYSGLuLUmXJRLau/LeLqkun4NieK8cw== X-Received: by 2002:a05:600c:216:b0:3b4:874c:61e6 with SMTP id 22-20020a05600c021600b003b4874c61e6mr10203656wmi.116.1663329197702; Fri, 16 Sep 2022 04:53:17 -0700 (PDT) Received: from localhost (host5-81-229-118.range5-81.btcentralplus.com. [5.81.229.118]) by smtp.gmail.com with ESMTPSA id h67-20020a1c2146000000b003a83ca67f73sm2288842wmh.3.2022.09.16.04.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 04:53:17 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 02/13] UBUNTU: [Packaging] generate-depends -- simplify unsigned to signed conversions Date: Fri, 16 Sep 2022 12:46:31 +0100 Message-Id: <20220916114642.2953019-3-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 | 1 - debian/scripts/generate-depends | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index a483cf6..4ff5061 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,6 @@ override_dh_auto_install: echo "$$signed boot" >>"debian/$$package.install"; \ \ ./debian/scripts/generate-depends linux-image-unsigned-$$verflav $(unsigned_ver) \ - linux-image-$$verflav \ >>"debian/linux-image-$$verflav.substvars"; \ \ for which in postinst postrm preinst prerm; do \ diff --git a/debian/scripts/generate-depends b/debian/scripts/generate-depends index eb63045..49d97fb 100755 --- a/debian/scripts/generate-depends +++ b/debian/scripts/generate-depends @@ -2,8 +2,7 @@ from="$1" version="$2" -to="$3" apt-cache show "$from=$version" | \ egrep '^(Depends|Suggests|Provides|Conflicts|Replaces|Recommends):' | \ - sed -e 's/: /=/' -e 's/^/unsigned:/' -e "s/\\<$to\\>/$from/" + sed -e 's/: /=/' -e 's/^/unsigned:/' -e "s/\\