From patchwork Wed Jan 11 08:58:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1724539 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=hReg/pNd; 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 4NsM6k44zpz23gB for ; Wed, 11 Jan 2023 19:58: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 1pFWwY-00041i-10; Wed, 11 Jan 2023 08:58:46 +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 1pFWwU-000412-Or for kernel-team@lists.ubuntu.com; Wed, 11 Jan 2023 08:58:42 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id 8DD3A3F762 for ; Wed, 11 Jan 2023 08:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673427522; bh=L0vyqycnBsztla41leepTh+czHkwx+uxBQ5OmCpfm1E=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hReg/pNd03jlQhzmtSd7NpdetjumyufjSSkBHAawRW1SmNy2gmGNib2LL2+JAuTkj JPvV3SVHawFF2/x4si9QTdRlwWZ6r767b0nB3dds96ZEIFlTP243vALgHfOtBqg28T VLtmoBD0JZOtcK4y/RMlkWJgpdycMHfxkPo2dwSRkbgGj1FV7zdsaIGUQJAOq59Iae tXsW/c6lenGNhKtjn4SbRlBllMS9CklPNXIcLq6CwxrivPO6uuubsFF5s8x0TLz63W v+2ZtWA3T0T6QWwoi4AmX9CCTrMW17LmBg6rPGh2dSl9b4U0J+yb/nYzkUTppiHmrv +zLkBBR6YAf2g== Received: by mail-wm1-f72.google.com with SMTP id fm25-20020a05600c0c1900b003d9702a11e5so7512413wmb.0 for ; Wed, 11 Jan 2023 00:58:42 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L0vyqycnBsztla41leepTh+czHkwx+uxBQ5OmCpfm1E=; b=63Xxylb1089GMpryfxpQ5ebNILFzdZ/H8zrwAbKK7cD+W3wHSm54ZazsPWaevK045b yUW/frzKsCYXh0FsPeK8qZovyEJVPEeP7W19fAYFGq1GFv3XqnHttPiSoDDl6K3ntkvW SCphYlkRXKBdoS6pJF/7644dNBKjsDUwpsDE/ediwTUkuSXKM+8As2CVPw61yY7MQ6ad rR8+a/S6hCr+Pvb0AqtKmo0za3BA5UXdsdL/jo7Jnse6H7+OoKZiOcSv2/N57YYVD289 5jaDj7xiQXCz55PzAH9OPICJDyJ49BniCyHRDWHDNyhrUYFzmkw/LG5mvEgOmPy0sJ13 aEiQ== X-Gm-Message-State: AFqh2kriryrZ+OLeSx7nTPZ2nTNHf6R0MpqrF1sQG8DDxyDGaroER+73 ooozVF22MwXKDwIo3q0gUE3Bgxy39WjnLI3lTzGGY1wt8dpbo8AxMKVaW1NRy/+HB2Hjq3Nq+dp G6T/i7zYxvKJpye/+sAsVVP7c5PEvueUZkqs9nZk29w== X-Received: by 2002:a05:600c:c8a:b0:3d9:7062:e0b7 with SMTP id fj10-20020a05600c0c8a00b003d97062e0b7mr46027449wmb.33.1673427522303; Wed, 11 Jan 2023 00:58:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXt8Ar1DpAKPH6KfINzWnxwjELRsesjpwI14ffVrGcpiT4soblwkT7HfeyNU9ZCgxbkF7VxevQ== X-Received: by 2002:a05:600c:c8a:b0:3d9:7062:e0b7 with SMTP id fj10-20020a05600c0c8a00b003d97062e0b7mr46027438wmb.33.1673427522033; Wed, 11 Jan 2023 00:58:42 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e18-20020a05600c4e5200b003d9876aa04asm20988458wmq.41.2023.01.11.00.58.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 00:58:41 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 1/5] UBUNTU: [Packaging] debian/rules: Drop AUTOBUILD Date: Wed, 11 Jan 2023 09:58:35 +0100 Message-Id: <20230111085839.96754-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230111085839.96754-1-juerg.haefliger@canonical.com> References: <20230111085839.96754-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" AUTOBUILD is a Ben Collins mechanism introduced in 2007 for daily kernel builds on internal builders. It hasn't been used in ages so drop it. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 27 +++------------------------ debian/rules.d/1-maintainer.mk | 1 - debian/rules.d/2-binary-arch.mk | 4 ---- debian/rules.d/3-binary-indep.mk | 14 ++++++-------- 4 files changed, 9 insertions(+), 37 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index d3ba95eb8822..cd4ffd92e009 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -30,27 +30,6 @@ upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile) upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile) upstream_tag := "v$(upstream_version).$(upstream_patchlevel)" -# This is an internally used mechanism for the daily kernel builds. It -# creates packages whose ABI is suffixed with a minimal representation of -# the current git HEAD sha. If .git/HEAD is not present, then it uses the -# uuidgen program, -# -# AUTOBUILD can also be used by anyone wanting to build a custom kernel -# image, or rebuild the entire set of Ubuntu packages using custom patches -# or configs. -AUTOBUILD= - -ifneq ($(AUTOBUILD),) -skipabi = true -skipmodule = true -skipretpoline = true -skipdbg = true -gitver=$(shell if test -f .git/HEAD; then cat .git/HEAD; else uuidgen; fi) -gitverpre=$(shell echo $(gitver) | cut -b -3) -gitverpost=$(shell echo $(gitver) | cut -b 38-40) -abi_suffix = -$(gitverpre)$(gitverpost) -endif - ifneq ($(NOKERNLOG),) ubuntu_log_opts += --no-kern-log endif @@ -78,8 +57,8 @@ ifeq ($(full_build),false) skipdbg=true endif -abinum := $(firstword $(subst .,$(space),$(revision)))$(abi_suffix) -prev_abinum := $(firstword $(subst .,$(space),$(prev_revision)))$(abi_suffix) +abinum := $(firstword $(subst .,$(space),$(revision))) +prev_abinum := $(firstword $(subst .,$(space),$(prev_revision))) abi_release := $(release)-$(abinum) uploadnum := $(patsubst $(abinum).%,%,$(revision)) @@ -143,7 +122,7 @@ hdrs_pkg_name=linux-headers-$(abi_release) indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release) # -# The generation of content in the doc package depends on both 'AUTOBUILD=' and +# The generation of content in the doc package depends on # 'do_doc_package_content=true'. There are usually build errors during the development # cycle, so its OK to leave 'do_doc_package_content=false' until those build # failures get sorted out. Finally, the doc package doesn't really need to be built diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 2cc14dc5b6a5..2ff4fe60851f 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -79,7 +79,6 @@ printenv: @echo "prev_revision = $(prev_revision)" @echo "abinum = $(abinum)" @echo "upstream_tag = $(upstream_tag)" - @echo "gitver = $(gitver)" @echo "variants = $(variants)" @echo "flavours = $(flavours)" @echo "skipabi = $(skipabi)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 365656ea6272..6014a4ba6861 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -834,11 +834,7 @@ build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-ins build-arch: $(build-arch-deps-true) @echo Debug: $@ -ifeq ($(AUTOBUILD),) binary-arch-deps-$(do_flavour_image_package) += binary-debs -else -binary-arch-deps-$(do_flavour_image_package) = binary-debs -endif binary-arch-deps-$(do_libc_dev_package) += binary-arch-headers ifneq ($(do_common_headers_indep),true) binary-arch-deps-$(do_flavour_header_package) += binary-headers diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 520a6c03bbe7..ccc1c1f0079d 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -40,14 +40,12 @@ ifeq ($(do_doc_package),true) install -d $(docdir) ifeq ($(do_doc_package_content),true) # First the html docs. We skip these for autobuilds - if [ -z "$(AUTOBUILD)" ]; then \ - install -d $(docdir)/$(doc_pkg_name)-tmp; \ - $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \ - install -d $(docdir)/html; \ - rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/output/ \ - $(docdir)/html/; \ - rm -rf $(docdir)/$(doc_pkg_name)-tmp; \ - fi + install -d $(docdir)/$(doc_pkg_name)-tmp + $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs + install -d $(docdir)/html + rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/output/ \ + $(docdir)/html/ + rm -rf $(docdir)/$(doc_pkg_name)-tmp endif # Copy the rest cp -a Documentation/* $(docdir) From patchwork Wed Jan 11 08:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1724537 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=f6+BnBs7; 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 4NsM6k37d3z23fY for ; Wed, 11 Jan 2023 19:58: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 1pFWwY-00041v-89; Wed, 11 Jan 2023 08:58:46 +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 1pFWwV-000419-IU for kernel-team@lists.ubuntu.com; Wed, 11 Jan 2023 08:58:43 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.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 4BE0F3F5D3 for ; Wed, 11 Jan 2023 08:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673427523; bh=yN2/LVGRL9sV8OJg0w0z2aA7HMPrGf3nQ0bPN1gQPlQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f6+BnBs7Q3VSOhVXwT9qBUi1/uwLk67npxDMEWFHT+PRNjRJ49t0p+uzdSYHszk1e nF0yShmxSJCkRmNP37ijanRHWH5c58DSuFYcIoYZj0VaEJrReRRtkekJ/U9Cf80SgE ujSOGdSlN8v2oBly4/XW1Y08KqAj5HoifkT/aZZZzXBxqsbeGgEP9co63UGc5d8hzO eLq5UkvIyayCGgF4unVZDXEzHJ/qw0rAZklB8MfINX/dwTTA26W8WG6iSZrCPQsnQy C4PrEl5+7sHFfI7IBiOyiyZLoi+Q9S1uu9b8B5w18GNqJdx9r1CdORfb/am9n4DoA5 N0tMkjXbkgYzQ== Received: by mail-wm1-f70.google.com with SMTP id p34-20020a05600c1da200b003d990064285so10384871wms.8 for ; Wed, 11 Jan 2023 00:58:43 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yN2/LVGRL9sV8OJg0w0z2aA7HMPrGf3nQ0bPN1gQPlQ=; b=I3kM+bV6hX6sAjekliuy88/hd7dxxyliM5K5m/Oxloa4Sy7zypeFugiUvyBsk5Qgaj GQMNON5vbAV4bPBRpddxGac9/Nr1Vgnb79CRYZAEUR3s+qSPthOhgNvBEiinIGDRCeBp k3u1/LBN/AEi6CT6npg/xC17IohG+dlL6iNAkuDmb0JaYC4AFMCDlKGJ4swCcdWDZ+BZ 7N3LLfOvXkUtXa+8oO+5jisVJ0tyHAG5izpdPwZ1wuTdxlcyYhkyqxI+aaKzJf4fNPgJ P4CzjB24MX7WV3UUv0hm/ByaRlBrOhn0zbkEF2b2aM/zqjsrbpoSQMVOuCfdcHrJVYTA wlpA== X-Gm-Message-State: AFqh2kpkqJzGNJvoxQHPSMc7HfsyY/7BwgC1NMvL5he7uVxPV5qaraDm CHG8SiLWQ4Ua3qDo387jbLeQWLK/53Y1TF6jSbvnHp+BmN5lkbSI7MGmGEAdwb29+U2c3E28AJS CYrq6TxtSCe/yfVCM3fpe9iywfUPyCYjPl19gxP02Yw== X-Received: by 2002:a05:600c:1d98:b0:3d3:48f4:7a69 with SMTP id p24-20020a05600c1d9800b003d348f47a69mr62063659wms.17.1673427523003; Wed, 11 Jan 2023 00:58:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXufx3mDfKpKvvVNQsx5ih+T7Qi19f1AkJvqqj/DhwzWnEQXJNPjV5LHJ/2aZWilzliCcdNcLA== X-Received: by 2002:a05:600c:1d98:b0:3d3:48f4:7a69 with SMTP id p24-20020a05600c1d9800b003d348f47a69mr62063650wms.17.1673427522808; Wed, 11 Jan 2023 00:58:42 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e18-20020a05600c4e5200b003d9876aa04asm20988458wmq.41.2023.01.11.00.58.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 00:58:42 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 2/5] UBUNTU: [Packaging] debian/rules: Drop NOKERNLOG and PRINTSHAS env variables Date: Wed, 11 Jan 2023 09:58:36 +0100 Message-Id: <20230111085839.96754-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230111085839.96754-1-juerg.haefliger@canonical.com> References: <20230111085839.96754-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 env variables NOKERNLOG and PRINTSHAS were introduced in 2007 for some special case and to retain old behavior when generating the changelog. That hasn't been used in ages and git-ubuntu-log doesn't even support it anymore since 2016 so drop it all. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 7 ------- debian/rules.d/1-maintainer.mk | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index cd4ffd92e009..7fbff78a47fb 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -30,13 +30,6 @@ upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile) upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile) upstream_tag := "v$(upstream_version).$(upstream_patchlevel)" -ifneq ($(NOKERNLOG),) -ubuntu_log_opts += --no-kern-log -endif -ifneq ($(PRINTSHAS),) -ubuntu_log_opts += --print-shas -endif - # Get the kernels own extra version to be added to the release signature. raw_kernelversion=$(shell make kernelversion) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 2ff4fe60851f..41d61adbd8ac 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -33,10 +33,8 @@ help: @echo @echo "Environment variables:" @echo - @echo " NOKERNLOG : Do not add upstream kernel commits to changelog" @echo " CONCURRENCY_LEVEL=X" @echo " : Use -jX for kernel compile" - @echo " PRINTSHAS : Include SHAs for commits in changelog" .PHONY: printdebian printdebian: @@ -84,7 +82,6 @@ printenv: @echo "skipabi = $(skipabi)" @echo "skipmodule = $(skipmodule)" @echo "skipdbg = $(skipdbg)" - @echo "ubuntu_log_opts = $(ubuntu_log_opts)" @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" @echo "ubuntu_selftests = $(ubuntu_selftests)" @echo "bin package name = $(bin_pkg_name)" @@ -132,7 +129,7 @@ printchanges: gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \ fi; \ git log "$$baseCommit"..HEAD | \ - $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) + $(DROOT)/scripts/misc/git-ubuntu-log insertchanges: autoreconstruct finalchecks $(DROOT)/scripts/misc/insert-changes $(DROOT) $(DEBIAN) From patchwork Wed Jan 11 08:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1724535 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=KPtSwhAf; 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 4NsM6k4P6vz23gL for ; Wed, 11 Jan 2023 19:58:54 +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 1pFWwZ-000435-HC; Wed, 11 Jan 2023 08:58:47 +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 1pFWwW-00041G-Bm for kernel-team@lists.ubuntu.com; Wed, 11 Jan 2023 08:58:44 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id 25CED3F762 for ; Wed, 11 Jan 2023 08:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673427524; bh=QdQ6nYVz4he8HY3bHJftyK2ZET74abhuO9KE+94I3qo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KPtSwhAfyZAPfaOy05Z88vcddX4/f7u4QvYhvZZSAYCs9gCjxXAFPY7ePfmvR3os8 9PozMLPE11y30LLLi2wsHGRWVfRv1ll1OF/0BFqaLsJmrc4UTojVq7JX6yXsRHEo5C hX2EzIe1rPXMvtF6qrClo98rwrk25Xv9ksr+QUxZG0opOnRvQ37bUvQqZ78xxTCvRP +JTMPjaBRP36+Xl5snwCOAMfnIq+ehVBUtGKG2+gOQbTtB4NTCMTcbdtughR5mpjn0 RtsK9OVgDeOhoLT9ucvXnAojVv/3d8NztvLm82Z8NypgBh7JiBd7GoBHXp3v9hPswT QeME1435i+mVQ== Received: by mail-wm1-f72.google.com with SMTP id m7-20020a05600c4f4700b003d971a5e770so7489120wmq.3 for ; Wed, 11 Jan 2023 00:58:44 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QdQ6nYVz4he8HY3bHJftyK2ZET74abhuO9KE+94I3qo=; b=fRDr6kaNn7Y4K0J/8hdlGpswZGL9/m1vRUK8KVmP8NdnJrZMZlwkDwCp1xZvvCwVly N7Xwu+5Q3jHR/bplQ3aXcwkJ2HYfOMgR6eBdN7m8OqyeVTcZzW6kKof2WhXqO1f0gzll GOsxjgVh8fq5bu5rSci7Kcj18qyfHjFbOo+YKLHihMr/Cs1jC9xA/Q/vgxW2npIkFBok vPjd9ZJkzB0oCk9YAUjlhCTpN4L+4/F+iNvjpQbxS9mgSAI7pjNxyRofCR5loOWxmku6 tF/SMbPMd16/fXO7N7raqOlJgAFrYdqsmZu4XHX9dfqiT0G8DcuB2QlGYJiBD4um0205 cpgQ== X-Gm-Message-State: AFqh2kqzCQsN1N/jDBQ4hLyy9p03NZoXiMS+kksEIZ8TRSOVPxR7Khrd Mcx7Cepk6M8qmWL3zj1WGa0SiMMn2f8cKpNoGbB9q9E/Ip9R4UT7XrG9on3gXtQjrdfna3v/efG DQI7ZR/lF8Dt8qkt3lfcIyDEXQmelRTuZTQY1hcWVBA== X-Received: by 2002:a05:600c:3d11:b0:3cf:8b22:76b3 with SMTP id bh17-20020a05600c3d1100b003cf8b2276b3mr52191822wmb.0.1673427523896; Wed, 11 Jan 2023 00:58:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnJMLhOOVCWRwocIWyj41JXT8Y7T7WumaxhdY7ELsT2ZTFBj9q0NEirMfS8MpkHq2487ABqA== X-Received: by 2002:a05:600c:3d11:b0:3cf:8b22:76b3 with SMTP id bh17-20020a05600c3d1100b003cf8b2276b3mr52191813wmb.0.1673427523688; Wed, 11 Jan 2023 00:58:43 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e18-20020a05600c4e5200b003d9876aa04asm20988458wmq.41.2023.01.11.00.58.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 00:58:43 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 3/5] UBUNTU: [Packaging] debian/rules: Replace skip variables with skip_checks Date: Wed, 11 Jan 2023 09:58:37 +0100 Message-Id: <20230111085839.96754-4-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230111085839.96754-1-juerg.haefliger@canonical.com> References: <20230111085839.96754-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" There are different skip variables to disable individual ABI checks but they're all set together and only for mainline builds so replace them with the single variable skip_checks. Signed-off-by: Juerg Haefliger --- debian/rules | 4 +--- debian/rules.d/1-maintainer.mk | 3 +-- debian/rules.d/4-checks.mk | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index f2b460354f6c..7775c0e92c46 100755 --- a/debian/rules +++ b/debian/rules @@ -95,9 +95,7 @@ ifeq ($(do_mainline_build),true) do_tools=false no_dumpfile=1 $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false)) - skipabi=true - skipmodule=true - skipretpoline=true + skip_checks=true endif # Disable tools build and packaging if do_tools != true diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 41d61adbd8ac..0e10a84cce1d 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -79,8 +79,7 @@ printenv: @echo "upstream_tag = $(upstream_tag)" @echo "variants = $(variants)" @echo "flavours = $(flavours)" - @echo "skipabi = $(skipabi)" - @echo "skipmodule = $(skipmodule)" + @echo "skip_checks = $(skip_checks)" @echo "skipdbg = $(skipdbg)" @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" @echo "ubuntu_selftests = $(ubuntu_selftests)" diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index fc263f32e0ce..b13f043b11b0 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -2,13 +2,13 @@ abi-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/abi-check "$*" \ - "$(prev_abidir)" "$(abidir)" $(skipabi) + "$(prev_abidir)" "$(abidir)" $(skip_checks) # Check the module list against the last release (always) module-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/module-check "$*" \ - "$(prev_abidir)" "$(abidir)" $(skipmodule) + "$(prev_abidir)" "$(abidir)" $(skip_checks) # Check the signature of staging modules module-signature-check-%: $(stampdir)/stamp-install-% @@ -21,7 +21,7 @@ module-signature-check-%: $(stampdir)/stamp-install-% retpoline-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/retpoline-check "$*" \ - "$(prev_abidir)" "$(abidir)" "$(skipretpoline)" "$(builddir)/build-$*" + "$(prev_abidir)" "$(abidir)" "$(skip_checks)" "$(builddir)/build-$*" checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% @echo Debug: $@ From patchwork Wed Jan 11 08:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1724536 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=ud4tHffQ; 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 4NsM6k3BxQz23fj for ; Wed, 11 Jan 2023 19:58:54 +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 1pFWwZ-00043Q-Ro; Wed, 11 Jan 2023 08:58:47 +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 1pFWwX-00041b-8x for kernel-team@lists.ubuntu.com; Wed, 11 Jan 2023 08:58:45 +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-1.canonical.com (Postfix) with ESMTPS id 1C1573F762 for ; Wed, 11 Jan 2023 08:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673427525; bh=zONl9azbybN6fI/XT1PpEi5y9FP/WKOnm88jySzGc3w=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ud4tHffQsNGitzAl7/P+EfSSe0S+2+1COkmq8fVK7uw4T/Gx47iMgVwsDN26sIaII 79m//0/bDoIjvM8oKmePSWC7TGsr8glkxmzSxS6zC1QyQyza6aYzTPqZt3f5dcudMm iruWiyeNaf+bIvM92RiNPGLfIfsLfVtWP6sSzbH3g9W0Bs7q1j4/1f9YoryHTf5eaB Kz0S9lbElpBnAjXzjc7ZyRyqSF/qW6o2y/sKIJlRqVEDFa4dmitiTZ4hHcS4BbdAAp omOG3QS96GrncTtAIG4GSK5HXRHGl3Zd+syZ9hxtTUcSrTA5p+LLQo4WLKWvAIby47 +NpOVixCz0KDQ== Received: by mail-wr1-f72.google.com with SMTP id u15-20020adfa18f000000b002b129dc55bfso2548515wru.11 for ; Wed, 11 Jan 2023 00:58:45 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zONl9azbybN6fI/XT1PpEi5y9FP/WKOnm88jySzGc3w=; b=Iedlar/ub/VKvFarRoTsoizm+I9cNxEtcu/0gZOxgZvRiVyma1WWhjiBl8SwbCBYfM MjKQTW0/7yI44vrgMbniIiwmFAFJKt9KpMMFLIb8ITxpND/xkqI0Cr2JjWZn4nOl77EL bc3CbhGKxtIhkcZrTY26RfganwTvAulhDm+2qsaErjTExQjsVgXKO59LMcihz80W4/+E jC0/JJpMQ68qS4ClQk1WrH8y1Blntlgux/YwQb0PHM2sUDk0c6vlflaYbhM5EGH7kZ1t 8FOEA38JZUdO3qwu1paaojZna/XDzLAtCIoBF0myWv7UzbLKfNStNEtHIMghXuGzkFLS 9lIA== X-Gm-Message-State: AFqh2kopE7qwGibMXdr62xjdtctdxPr9Tgq8eFUhuzdiBI2fmqkYdChk qZBAxOL5+5Rmt48W8Qq/NPsVpa6AyhRFsj0oFnPDE7wiPCUrMf7IAwEK4VVco4RU80dIs7AmC7l oHsv3SXD54u7qFoU/13A7H5F34H5tgWtMFHdku3ERqA== X-Received: by 2002:a05:600c:3509:b0:3d9:e9a2:eea3 with SMTP id h9-20020a05600c350900b003d9e9a2eea3mr9909470wmq.37.1673427524715; Wed, 11 Jan 2023 00:58:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXtCsAtdCJN9fBDXXWaAnDMtHvm/dCdPyhTbQpbYfhamFq3/VKHlgoZEKLbqCyBzHkzwyYObfw== X-Received: by 2002:a05:600c:3509:b0:3d9:e9a2:eea3 with SMTP id h9-20020a05600c350900b003d9e9a2eea3mr9909462wmq.37.1673427524498; Wed, 11 Jan 2023 00:58:44 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e18-20020a05600c4e5200b003d9876aa04asm20988458wmq.41.2023.01.11.00.58.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 00:58:44 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 4/5] UBUNTU: [Packaging] checks/retpoline-check: Make 'skipretpoline' argument optional Date: Wed, 11 Jan 2023 09:58:38 +0100 Message-Id: <20230111085839.96754-5-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230111085839.96754-1-juerg.haefliger@canonical.com> References: <20230111085839.96754-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" Make the 'skipretpoline' argument optional and also more robust to match the other checker scripts. While at it, drop the invalid/unused 5th argument from the call site in the rules file. Signed-off-by: Juerg Haefliger --- debian/rules.d/4-checks.mk | 2 +- debian/scripts/checks/retpoline-check | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index b13f043b11b0..4afe42fa629f 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -21,7 +21,7 @@ module-signature-check-%: $(stampdir)/stamp-install-% retpoline-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/retpoline-check "$*" \ - "$(prev_abidir)" "$(abidir)" "$(skip_checks)" "$(builddir)/build-$*" + "$(prev_abidir)" "$(abidir)" $(skip_checks) checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% @echo Debug: $@ diff --git a/debian/scripts/checks/retpoline-check b/debian/scripts/checks/retpoline-check index 7dbfb303360b..5a0f870a741b 100755 --- a/debian/scripts/checks/retpoline-check +++ b/debian/scripts/checks/retpoline-check @@ -3,7 +3,12 @@ flavour="$1" prev_abidir="$2" curr_abidir="$3" -skipretpoline="$4" + +skipretpoline=${4:-} +case "${skipretpoline,,}" in + 1|true|yes) skipretpoline=true ;; + *) skipretpoline=false ;; +esac echo "II: Checking retpoline indirections for $flavour..."; From patchwork Wed Jan 11 08:58:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1724540 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=k5iZcByI; 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 4NsM6l3vKzz23gN for ; Wed, 11 Jan 2023 19:58:55 +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 1pFWwb-00045E-Dz; Wed, 11 Jan 2023 08:58:49 +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 1pFWwY-00041x-RR for kernel-team@lists.ubuntu.com; Wed, 11 Jan 2023 08:58:46 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.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 E22B53F5D3 for ; Wed, 11 Jan 2023 08:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1673427525; bh=VzNVa3iDt2C4svBrq/ULfMQylG1XT72wC0IWlFAUAd8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k5iZcByIsmqh5HGE4/4TYTitQXv5Bx1sV+Vm5dp9oC0I6wPfb6P1ZCedJmlw5VKLE lflWLcgc/v8NP//jsJ8IyT8YUlZpxAARaZSW4hZH9Yz8kviiiis9cpP/zC+fLdXpQs RN593UWhD92fFz7RYfA4oSVmAfOKT5Ej5fbC1EWMdSN7fqdun8U+H3N4rL1aph+tR/ r+bDkf49PQABnJYSpfj9R0lizylYJrYd2OU9/zTnFyBFxRnGLoipRAQQZ+rkq1QfN3 CsPBWJn+cieCRtAnwHlB4cgG+YhfGmh0lrko0MFUFaNC1iRO6jIHT6+1o35wyip9T5 1hN2ksWrVHHfg== Received: by mail-wr1-f70.google.com with SMTP id i2-20020adfaac2000000b002bc40f98167so1776808wrc.2 for ; Wed, 11 Jan 2023 00:58:45 -0800 (PST) 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VzNVa3iDt2C4svBrq/ULfMQylG1XT72wC0IWlFAUAd8=; b=t2WbuQj86mLmysSni3S0pX1RTwUswvn7FmYaxShS3uSZwkfkAdvItkRr6MCmKwT5AK DYW/GHGpqvzSoJZ7VH0t97MbXDK2mog+CIxH/WBN+I8LZWT4vU7hCCFbbQPAGhDoTc22 fUrF4z9lCJ4tEhPoLyuCdtkz4RUCExhgiaFUUG3wi+KKMAN83rFAtD3x5PKix2VAC2Y7 K/GthkzrwRW5pxHDZ4INRgFel1pRekrX6HmUOAkXpL4kP7k+whkQPJHZNBL5fA30J2Py N+LU53g5cWgZtHWUDeB3MkKDGUOIhS6sM7IXGe3LGkOczlrS/uA8/xvCrAJRMAHv8AtG zs5w== X-Gm-Message-State: AFqh2kqzA+Zs3bp+zxqZsU0UTMsBv6URNZpB1I+Lf+ZoAJL0AOk9x5jo FVzacMlUxnYTGuCHH4pgvGaUkM2eeucxbUlJb1Lm+F8xDIrTyjPZoCA2j74wFTuGW3eBsw8hcU8 e4Zx/bdZD1lGcrXT7ZJc6spogPBWUA07ijs1cPdj4Cw== X-Received: by 2002:a05:600c:c8a:b0:3d9:7062:e0b7 with SMTP id fj10-20020a05600c0c8a00b003d97062e0b7mr46027579wmb.33.1673427525625; Wed, 11 Jan 2023 00:58:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXv+pbWSwlamZyJIhFQ7IwqACIt8mfNr+Uq/eW7bgIC10ttrQHgQ2N1K20f01oGX3qGqh4NgHw== X-Received: by 2002:a05:600c:c8a:b0:3d9:7062:e0b7 with SMTP id fj10-20020a05600c0c8a00b003d97062e0b7mr46027573wmb.33.1673427525393; Wed, 11 Jan 2023 00:58:45 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id e18-20020a05600c4e5200b003d9876aa04asm20988458wmq.41.2023.01.11.00.58.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 00:58:44 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH 5/5] UBUNTU: [Packaging] checks/module-signature-check: Add 'skip_checks' argument Date: Wed, 11 Jan 2023 09:58:39 +0100 Message-Id: <20230111085839.96754-6-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230111085839.96754-1-juerg.haefliger@canonical.com> References: <20230111085839.96754-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" Add an optional 'skip_checks' argument to match the other checker scripts. This is used for mainline builds to not fail a build even if the checker script finds problems. Signed-off-by: Juerg Haefliger --- debian/rules.d/4-checks.mk | 3 ++- debian/scripts/checks/module-signature-check | 27 +++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index 4afe42fa629f..791ba7a0a30a 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -15,7 +15,8 @@ module-signature-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/module-signature-check "$*" \ "$(DROOT)/$(mods_pkg_name)-$*" \ - "$(DROOT)/$(mods_extra_pkg_name)-$*" + "$(DROOT)/$(mods_extra_pkg_name)-$*" \ + $(skip_checks) # Check the reptoline jmp/call functions against the last release. retpoline-check-%: $(stampdir)/stamp-install-% diff --git a/debian/scripts/checks/module-signature-check b/debian/scripts/checks/module-signature-check index 67736c289820..2df07a4c324e 100755 --- a/debian/scripts/checks/module-signature-check +++ b/debian/scripts/checks/module-signature-check @@ -4,6 +4,12 @@ flavor="${1}" mods_dir="${2}" mods_extra_dir="${3}" +skip_checks=${4:-} +case "${skip_checks,,}" in + 1|true|yes) skip_checks=1 ;; + *) skip_checks=0 ;; +esac + echo "II: Checking signature of staging modules for ${flavor}..." root=$(dirname "$(realpath -e "${0}")")/../../.. @@ -30,6 +36,11 @@ fi if ! [ -d "${mods_dir}" ] ; then echo "EE: Modules directory missing:" echo " ${mods_dir}" + if [ ${skip_checks} -eq 1 ] ; then + echo "WW: Explicitly asked to ignore failures" + echo "II: Done" + exit 0 + fi exit 1 fi @@ -67,10 +78,14 @@ done < <(find "${mods_dirs[@]}" -path '*/drivers/staging/*.ko' | sort) echo "II: Checked $((pass + fail)) modules : ${pass} PASS, ${fail} FAIL" -if [ ${fail} -eq 0 ] ; then - echo "II: Done" - exit 0 -else - echo "EE: Modules signature failures" - exit 1 +if [ ${fail} -ne 0 ] ; then + if [ ${skip_checks} -eq 1 ] ; then + echo "WW: Explicitly asked to ignore failures" + else + echo "EE: Modules signature failures" + exit 1 + fi fi + +echo "II: Done" +exit 0