From patchwork Mon Mar 27 07:12:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1761380 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=afjbTbg5; 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 4PlPCl57S2z1yYf for ; Mon, 27 Mar 2023 18:12:51 +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 1pgh25-0006Rr-Bi; Mon, 27 Mar 2023 07:12:45 +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 1pgh1w-0006OM-DH for kernel-team@lists.ubuntu.com; Mon, 27 Mar 2023 07:12:36 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 336803F210 for ; Mon, 27 Mar 2023 07:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1679901156; bh=WHNmB3Ae2shixZf93XqMii50WvwUBq6yQR3ecwVJx84=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=afjbTbg5AfdWrTYDeGhpRLYr/dBzPqvcFB1zLyXFZ9Pp5Rn43gr4JlNilM+UYul8n pQj3Dkur09sjyFnQbbiG1BvJSb/087OCX4SmgUGffy8l+xQU9VpGDcasOANawz2V2z loY4O+kj0c5wKcIYoBPdMb2Ynmw0glWI2qoEkAf2u/gyb6USVBF2TmEMwRe0yS/9LJ jxXz/gxzAD9SJ6Tr9vt+OcHXSYwdipbiCDX5lt8QnNAVHVhu2J67pY4koERbrst+F8 YD8OJkoETVZoV8kmibgUoEiJOA6pn4/lVEChl+AXdAD8Xs1Znf0SdCJcPu83t1F9QR qb+qDudpt7Ngw== Received: by mail-ed1-f70.google.com with SMTP id es16-20020a056402381000b004fa3e04c882so11108355edb.10 for ; Mon, 27 Mar 2023 00:12:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679901156; 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=WHNmB3Ae2shixZf93XqMii50WvwUBq6yQR3ecwVJx84=; b=MgmI9ObVazJ8BWT0CqLHZaWjKxrZxO/pWGzr+v6p8DNz6q7Qk7sCJ0lawFlJvALf9U NPi5TXfMLvYs64tpz2RM9VVjUZLk+R2DeQ0aGJ/4A1p92lQSzRqprd6d9SZqWnoaecw1 ugR4cLKLwxGJrLX58P6zQTelKNQpUwzCjoA2WufH7zE0ENTz0ARutXKuPSSy1KhtefOx ZA+Qino5z8su14Za7QY6CsU0ajJZPDIrSdRFj4g45tJiaN5zVlzTmTT2+/DUZb9APb1J iKM5W+zE9T/ZIZf5lCtdCVWKLfdY2Zkl6feVYMAgPcE+6TrZrB2eW7LzsD0V5qZvYMa8 BrFA== X-Gm-Message-State: AAQBX9ctig92JsOmltTzvDXLDfYiIbpjrVsVZNjDT87anfP1eQ365DBC Z+DRFLnx9jvjbuq147JeXRnp8qCQ1XI2FpWXVQyHJF7ifDIQ5CLPbsUaX5qgx6R1iStpRAmyec7 LyyYU3Ju0E22GEY9dki2GcFKttNir8VAEbbrctXh1ng2bKML05A== X-Received: by 2002:a17:906:37c8:b0:870:58ae:842e with SMTP id o8-20020a17090637c800b0087058ae842emr11377351ejc.24.1679901155943; Mon, 27 Mar 2023 00:12:35 -0700 (PDT) X-Google-Smtp-Source: AKy350aXg8g37pwcpwfcBFxEAnvjmO483IPV1gf0G8dhbOLuhjYRT5YMjR2QBG4kE0DNqZvpO282Fw== X-Received: by 2002:a17:906:37c8:b0:870:58ae:842e with SMTP id o8-20020a17090637c800b0087058ae842emr11377342ejc.24.1679901155696; Mon, 27 Mar 2023 00:12:35 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id gv52-20020a1709072bf400b0093a7952411asm8300061ejc.48.2023.03.27.00.12.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 00:12:35 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][U/L][PATCH 1/2] UBUNTU: [Packaging] Move final-checks script to debian/scripts/checks Date: Mon, 27 Mar 2023 09:12:32 +0200 Message-Id: <20230327071233.420471-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230327071233.420471-1-juerg.haefliger@canonical.com> References: <20230327071233.420471-1-juerg.haefliger@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" Move the final-checks script to debian/scripts/checks so that all the checker scripts are in one place. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 2 +- debian/scripts/{misc => checks}/final-checks | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename debian/scripts/{misc => checks}/final-checks (100%) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index a5c81896cc84..bd2ca56c6e61 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -151,7 +151,7 @@ finalchecks: debian/control ifeq ($(do_fips_checks),true) $(DROOT)/scripts/misc/fips-checks endif - $(DROOT)/scripts/misc/final-checks "$(DEBIAN)" "$(prev_fullver)" + $(DROOT)/scripts/checks/final-checks "$(DEBIAN)" "$(prev_fullver)" .PHONY: startnewrelease startnewrelease: diff --git a/debian/scripts/misc/final-checks b/debian/scripts/checks/final-checks similarity index 100% rename from debian/scripts/misc/final-checks rename to debian/scripts/checks/final-checks From patchwork Mon Mar 27 07:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1761382 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=iNo7ssFZ; 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 4PlPCn3rCdz1yXq for ; Mon, 27 Mar 2023 18:12:53 +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 1pgh27-0006Tn-My; Mon, 27 Mar 2023 07:12:47 +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 1pgh1x-0006OZ-HV for kernel-team@lists.ubuntu.com; Mon, 27 Mar 2023 07:12:37 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 C67943FBA0 for ; Mon, 27 Mar 2023 07:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1679901156; bh=iNvu5Gf0Q5kaTwQFcTqeIvpVN+SsC+8vBi+HnhGfv7Q=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iNo7ssFZklbHTXGQkLdA7z51TdZRWF04u4Kjf/v5QFXXTFr0TgOpjEQwi6YMKOqqm JXvhpyI5EJCU9fhTSrFwLe7PcVw8/ZUW9m3TtiPC0hCJlN802H89DKRjEyXXgyxjwr /vXCdl9q1LbsecpBJuU1zf4OL49pmGzsYkRdbo02ZH1FENsPHSxbd8DUXws6Xo83Yx T4RG+xq8w6N39Hhfr74RESsytEXMdMdAs7XFEpb29qrmaqhgrFGSha4pscYdl/aCar 5Fuh6deEqYg1g1KnQl2NvEsAnRCjs8IrULb1YmFNA1FBD5kjcOL6cs2WDJNGFHCzIi HkpwTSE6onsIQ== Received: by mail-ed1-f70.google.com with SMTP id c11-20020a509f8b000000b00501e2facf47so11162980edf.16 for ; Mon, 27 Mar 2023 00:12:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679901156; 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=iNvu5Gf0Q5kaTwQFcTqeIvpVN+SsC+8vBi+HnhGfv7Q=; b=iRe17BhajiAtgs0nvxVLqaWbh0Hy83Kh2FmxOe//kS7K5iH6QvD6OUuxcNLiDnPzi2 qkLniHBWLW7nAeeDp4rPokxzvTs3z8Mj+2XsAJx2kPqpjoSXb4EqcHoLTfwC/3IU7pOQ qqXtGrakVA6UrPw3alCyjUkGTffCVyj8CI9vr7K27PsZdeY4ck2HcaPPRYzK2NzU+E1H D6KhyRGKEIejn8AiJ/Az+SXjzadk9m0jvqziqt6SgZMqFrOgkW3xB7wkzHydyRPuiViG KU4YdDq2mjKAnEkRWrEIyjmk/vee+CWA4SPYlGUveJl6oli23cBjl4yXNKjDO7f/MSWT TC2w== X-Gm-Message-State: AAQBX9dpZGUNYukDO5onmTqaKnbhrU0x3VHKQsFm0JnEBIngMcyheUVQ 6vWKYUxdDRz5swRuLkEwBmEKlGCdEjzqzrFCWZsPBjGBf03vQCjrA+Cv5DyUY4MexQEse/gVxfJ mx6U/7nr0DySqdin5FmGr8mKnbrrZEVjUR1Admp0YPV9X+Njjng== X-Received: by 2002:aa7:c68b:0:b0:4fb:78a0:eabf with SMTP id n11-20020aa7c68b000000b004fb78a0eabfmr11569127edq.29.1679901156502; Mon, 27 Mar 2023 00:12:36 -0700 (PDT) X-Google-Smtp-Source: AKy350Z3G4NoKvfsyBRU/VvponJLgh6MTEHoj4tfBqO5tE3xQry1BUXRVXrpViRQLQYFtC/stoT8kw== X-Received: by 2002:aa7:c68b:0:b0:4fb:78a0:eabf with SMTP id n11-20020aa7c68b000000b004fb78a0eabfmr11569118edq.29.1679901156313; Mon, 27 Mar 2023 00:12:36 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id gv52-20020a1709072bf400b0093a7952411asm8300061ejc.48.2023.03.27.00.12.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 00:12:36 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][U/L][PATCH 2/2] UBUNTU: [Packaging] checks/final-checks: Honor 'do_skip_checks' Date: Mon, 27 Mar 2023 09:12:33 +0200 Message-Id: <20230327071233.420471-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230327071233.420471-1-juerg.haefliger@canonical.com> References: <20230327071233.420471-1-juerg.haefliger@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" The final-checks script is doing some final ABI checkig that should be skipped if 'do_skip_checks' is true. Just like the other checker scripts in debian/scripts/checks. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 2 +- debian/scripts/checks/final-checks | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index bd2ca56c6e61..724a71c5dba1 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -151,7 +151,7 @@ finalchecks: debian/control ifeq ($(do_fips_checks),true) $(DROOT)/scripts/misc/fips-checks endif - $(DROOT)/scripts/checks/final-checks "$(DEBIAN)" "$(prev_fullver)" + $(DROOT)/scripts/checks/final-checks "$(DEBIAN)" "$(prev_fullver)" $(do_skip_checks) .PHONY: startnewrelease startnewrelease: diff --git a/debian/scripts/checks/final-checks b/debian/scripts/checks/final-checks index 5371057663a3..5d283e3c4c6a 100755 --- a/debian/scripts/checks/final-checks +++ b/debian/scripts/checks/final-checks @@ -3,6 +3,12 @@ debian="$1" abi="$2" +skipabi=${3:-} +case "${skipabi,,}" in + 1|true|yes) skipabi=true ;; + *) skipabi=false ;; +esac + archs=$(awk '/^Architecture:/ { $1=""; for (i=1; i<=NF; i++) { if ($i != "all") { print $i }}}' debian/control | sort -u) fail=0 @@ -100,7 +106,9 @@ do fi fi fi - abi_check "$debian/abi" "$arch" "$flavour" + if [ "${skipabi}" = "false" ] ; then + abi_check "$debian/abi" "$arch" "$flavour" + fi done done