From patchwork Mon May 3 09:12:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1473093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FYchd4KQXz9sTD; Mon, 3 May 2021 19:13:21 +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 1ldUdg-00015U-Fr; Mon, 03 May 2021 09:13:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ldUdf-00015N-GO for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 09:13:15 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ldUdf-0004wz-7h for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 09:13:15 +0000 Received: by mail-ed1-f72.google.com with SMTP id i2-20020a0564020542b02903875c5e7a00so4149371edx.6 for ; Mon, 03 May 2021 02:13:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=23MhLZcGZd1Hm62bSWVit5PgifC7Mijg8F+RSDQ5MK4=; b=hKdqgsxfIfv7EFwQFITs8o058a5Bk9T40MqpN+q7eVGUyVDOgmNurmMeDc1o9M+2qi k5mJHu6vHYNnc7gY7pquAQ0dbDfqBiFXxFXYQeQQU4t589dcGju1zaVcxsfNiNtDwG6N UJaU7cg0aa4LsagOjxzFbBFhAisQXzRTl5TqFqFD25qCmTbLrYTaVAUf403ryYgLAAcL JQZZ2z4IxJiA/rNWqrpE2gT1DiRSGn+j2KQoLGKhkGfUoa2v6uQNqvFX6l+ONQiu5uZb nHexaG50fp+BhguMP8oI02mSckqCXlQ0ce0y8fmWPlkYNfDMEGCbhYqXYwCM/hBgYZo1 CFDg== X-Gm-Message-State: AOAM531ANolet7Tv+VWiTrluEp4Mr3MqjdEWMPWM2KcFsqrZ43vMBJwB u599lQHs2EVIWDujg81U3o31+NqcmiSTmVE5/iEPJjJeYajLD375SQcCwgRNX/IQ9dCWRF601Dy 2RB2dNHNUySx3l1REMrSB6NuNHv4mEALL6nmYuakDQg== X-Received: by 2002:a17:906:5487:: with SMTP id r7mr15854485ejo.550.1620033194942; Mon, 03 May 2021 02:13:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBNpHCwZ9fXqbWRWM1UiJzRZOd5jKXVwo4Isv90/Bik1jmZCg80cb5zqoq/qbjAffH5b6UJQ== X-Received: by 2002:a17:906:5487:: with SMTP id r7mr15854479ejo.550.1620033194778; Mon, 03 May 2021 02:13:14 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id u1sm11631940edv.90.2021.05.03.02.13.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 02:13:14 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH] UBUNTU: [Packaging] Update modules.ignore just before the ABI check Date: Mon, 3 May 2021 11:12:41 +0200 Message-Id: <20210503091241.142103-1-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 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 certain conditions under which enabled DKMS modules are not generated during a package build. In order to prevent a subsequent 'missing modules' ABI check failure, the list of DKMS modules is added to the modules.ignore file. Currently, that file is generated/updated every time debian/rules is called. This is somewhat problematic since it also happens during regular kernel preparation and could lead to accidential commitment of these (temporary) modifications (stranger things have been committed, cough). To fix that, update/generate modules.ignore just before the ABI check which happens in a rule that is typically only invoked when building packages. Signed-off-by: Juerg Haefliger Acked-by: Tim Gardner --- debian/rules | 8 -------- debian/rules.d/4-checks.mk | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 1d53ecc1df7f..d73f3f1636a5 100755 --- a/debian/rules +++ b/debian/rules @@ -112,14 +112,6 @@ ifneq ($(do_tools),true) do_tools_host= endif -ifeq ($(do_zfs),false) - do_zfs_disable:=$(shell for m in $$(cat $(DROOT)/zfs-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) -endif - -ifeq ($(do_dkms_wireguard),false) - do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) -endif - # Either tools package needs the common source preparation do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index b99a1023fe5b..b5337b354b17 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -7,6 +7,20 @@ abi-check-%: install-% # Check the module list against the last release (always) module-check-%: install-% @echo Debug: $@ +ifeq ($(do_zfs),false) + # Ignore zfs DKMS modules + @for m in $$(cat $(DROOT)/zfs-modules.ignore); do \ + grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || \ + echo $$m >> $(prev_abidir)/../modules.ignore; \ + done +endif +ifeq ($(do_dkms_wireguard),false) + # Ignore wireguard DKMS modules + @for m in $$(cat $(DROOT)/wireguard-modules.ignore); do \ + grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || \ + echo $$m >> $(prev_abidir)/../modules.ignore; \ + done +endif @perl -f $(DROOT)/scripts/module-check "$*" \ "$(prev_abidir)" "$(abidir)" $(skipmodule)