From patchwork Thu Dec 8 07:17:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1713580 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=nM9Sd32P; 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 4NSQTm3S8bz2402 for ; Thu, 8 Dec 2022 18:17:47 +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 1p3BA0-0004cG-2D; Thu, 08 Dec 2022 07:17:36 +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 1p3B9x-0004bB-Kx for kernel-team@lists.ubuntu.com; Thu, 08 Dec 2022 07:17:33 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.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-1.canonical.com (Postfix) with ESMTPS id 510F041558 for ; Thu, 8 Dec 2022 07:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670483853; bh=q+U+es8l0868x0fZDqr2dmjPgbxwD8Ucr+fbxFhwIx0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nM9Sd32PGH3ChmW0fShQbDsVLarUHPSH9u/oSo0+gDY55L0aRqBHhpzPNRMPZ4hET h7V1s6Un+BVFN3xlKEFf9YCVHAT5O/4Wp8E039eHM3yvg3yBqCnCvUETnAxRDPhvdT XpdW4yzPU2wJ9cBdYuRQ6OfFg9brVf/LIWFmnn54FIiUhF7AqshY+uI7ZOpWLWoDGo G9rhcYmyWSXyyHt4PUx3mrFFk4A00VmLG8RN10LhqtLuzBxPY/5sP5TWPsw5N37EfB XffKb2wBR32WbfpIBeQbrWbotYTqRQgilSZltzxvZrKb4dRwfwer9ZQs9LMmWScBGG k8oj+fcGEKm/Q== Received: by mail-ed1-f71.google.com with SMTP id z4-20020a05640240c400b0046c51875c17so492787edb.1 for ; Wed, 07 Dec 2022 23:17:33 -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=q+U+es8l0868x0fZDqr2dmjPgbxwD8Ucr+fbxFhwIx0=; b=cnccCTaiEtt60HnMnHWj2v267YSTYSu13VnqlSJwTHV+gHzt0SOZM0+YF2uV158zct pz/tvFFbimgG+L7td5NBPAAFkRiSJdrxmRS2NLJ1NVyd2G3A7lZlYMpct2ASgP8cxRBS M7fBix5dSWMRM3nAux0tGkGT3Fx8aveyBRzLzJef0FhlPkGQj2NL+Q0HdQEar01lPgq5 7LRlPIGUEsy8pk0MTCVXcrt1/LwEeHcNBy6vs85ZH9RCAkL2XhCvVM2hsyl0m7w4Nowd RRNkY+kLTRK4oEl/+j6JmexdX3p+iaRQGO3TThO85NQTCh3ZQ/q7rKWuPgbRHUQ2q7PM 45rQ== X-Gm-Message-State: ANoB5plligd/tRCp4Ph9F7BXEQwVwecSHCk1maCfwm0TjMetK5gUGQeK 1rbpOiHLDW3OZp3+DQrATH8jlbjYr7UyRYGuOSgns6RiX2Wx+M4g+ZYEl9l9ALeADItbbbxkUuz umzWO2kMcVy2XONp7nu2Cn3pc0Y14YeSVy3N5YFqkhw== X-Received: by 2002:a17:906:17d7:b0:78d:f454:ba14 with SMTP id u23-20020a17090617d700b0078df454ba14mr1513611eje.19.1670483853127; Wed, 07 Dec 2022 23:17:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4VXS/8/Vj6/RClwe2VvpPsP2jfUjMcI7er15dC9MWEP6IwdiCgnKA8XmPeoasMorYJcddbeQ== X-Received: by 2002:a17:906:17d7:b0:78d:f454:ba14 with SMTP id u23-20020a17090617d700b0078df454ba14mr1513605eje.19.1670483852932; Wed, 07 Dec 2022 23:17:32 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id 4-20020a170906308400b007bd9e683639sm9346891ejv.130.2022.12.07.23.17.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 23:17:32 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 4/4] UBUNTU: [Packaging] Move checker scripts to debian/scripts/checks Date: Thu, 8 Dec 2022 08:17:28 +0100 Message-Id: <20221208071728.193067-5-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221208071728.193067-1-juerg.haefliger@canonical.com> References: <20221208071728.193067-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" Tidy up the scripts directory and move all checker scripts to a new subdirectory. Signed-off-by: Juerg Haefliger --- debian/rules.d/4-checks.mk | 11 +++++------ debian/scripts/{ => checks}/abi-check | 0 debian/scripts/{ => checks}/config-check | 0 debian/scripts/{ => checks}/module-check | 0 debian/scripts/{ => checks}/module-signature-check | 2 +- debian/scripts/{ => checks}/retpoline-check | 0 6 files changed, 6 insertions(+), 7 deletions(-) rename debian/scripts/{ => checks}/abi-check (100%) rename debian/scripts/{ => checks}/config-check (100%) rename debian/scripts/{ => checks}/module-check (100%) rename debian/scripts/{ => checks}/module-signature-check (97%) rename debian/scripts/{ => checks}/retpoline-check (100%) diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index 68ac5471c6e4..fc263f32e0ce 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -1,26 +1,26 @@ # Check ABI for package against last release (if not same abinum) abi-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ - $(DROOT)/scripts/abi-check "$*" \ + $(DROOT)/scripts/checks/abi-check "$*" \ "$(prev_abidir)" "$(abidir)" $(skipabi) # Check the module list against the last release (always) module-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ - $(DROOT)/scripts/module-check "$*" \ + $(DROOT)/scripts/checks/module-check "$*" \ "$(prev_abidir)" "$(abidir)" $(skipmodule) # Check the signature of staging modules module-signature-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ - $(DROOT)/scripts/module-signature-check "$*" \ + $(DROOT)/scripts/checks/module-signature-check "$*" \ "$(DROOT)/$(mods_pkg_name)-$*" \ "$(DROOT)/$(mods_extra_pkg_name)-$*" # Check the reptoline jmp/call functions against the last release. retpoline-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ - $(SHELL) $(DROOT)/scripts/retpoline-check "$*" \ + $(DROOT)/scripts/checks/retpoline-check "$*" \ "$(prev_abidir)" "$(abidir)" "$(skipretpoline)" "$(builddir)/build-$*" checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% @@ -30,11 +30,10 @@ checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% @echo Debug: $@ if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ - perl -f $(DROOT)/scripts/config-check \ + perl -f $(DROOT)/scripts/checks/config-check \ $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ "$(skipconfig)" "$(do_enforce_all)"; \ else \ python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ fi - diff --git a/debian/scripts/abi-check b/debian/scripts/checks/abi-check similarity index 100% rename from debian/scripts/abi-check rename to debian/scripts/checks/abi-check diff --git a/debian/scripts/config-check b/debian/scripts/checks/config-check similarity index 100% rename from debian/scripts/config-check rename to debian/scripts/checks/config-check diff --git a/debian/scripts/module-check b/debian/scripts/checks/module-check similarity index 100% rename from debian/scripts/module-check rename to debian/scripts/checks/module-check diff --git a/debian/scripts/module-signature-check b/debian/scripts/checks/module-signature-check similarity index 97% rename from debian/scripts/module-signature-check rename to debian/scripts/checks/module-signature-check index 80796b63e1be..67736c289820 100755 --- a/debian/scripts/module-signature-check +++ b/debian/scripts/checks/module-signature-check @@ -6,7 +6,7 @@ mods_extra_dir="${3}" echo "II: Checking signature of staging modules for ${flavor}..." -root=$(dirname "$(realpath -e "${0}")")/../.. +root=$(dirname "$(realpath -e "${0}")")/../../.. . "${root}"/debian/debian.env # Collect the signature-inclusion files diff --git a/debian/scripts/retpoline-check b/debian/scripts/checks/retpoline-check similarity index 100% rename from debian/scripts/retpoline-check rename to debian/scripts/checks/retpoline-check