From patchwork Tue May 11 07:28:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1476877 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 4FfV0C34nSz9t1C; Tue, 11 May 2021 17:28:43 +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 1lgMoq-0001jo-9z; Tue, 11 May 2021 07:28:40 +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 1lgMom-0001i5-2U for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:36 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lgMol-0006rU-RH for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:35 +0000 Received: by mail-ed1-f69.google.com with SMTP id k10-20020a50cb8a0000b0290387e0173bf7so10506758edi.8 for ; Tue, 11 May 2021 00:28:35 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=dOc/q86lBaaf6qxPYxjJMRpi5+yYybECRoV0BzEaF3A=; b=DJeq7if0toY+Ye7SXuDDnrPfbBF13+xP592TWKmlQgLDqKEe0hOkT34xZWsn7aHjz+ P1fhys2qTqyS96xGws2XxfWczrj7Z3aubL89ALKJPpT9iV7X9qrfQbmoaQwRmBeisNDP 1tQzH+w/B/Qc7sbxFZLGH7jCaGYRt+w+N9bJ0WCLbESgd7FUke0Ilr/b+eKh2qhSiUa9 d5uody+NtiODb1w0qEDOeXgjuIlNQBLPy3j6bXlgfambl7RBOHqpEvPoolO8p8Br0N35 E62S75WIcZpC4vT1htE4Ww4skGZT+7SBkYzAgg4P3pwbyNyZeGQBDAwkPW4Brdi7gVF3 h63w== X-Gm-Message-State: AOAM530RYIiVqHiNz+7ctVOgMKmqHuJ44BUMMT/aYbffHOF5ctuaFpgZ i5ZcRzjAA+NyC0xVlyD1L5cykcP/4ktwocepSCJjo8DnWPHv70GValV/1Xm2+KDCm+Z2xfkpir9 dYBPn6op42noR/Soy4Onm61ZMbEmcRDVPic3PjZhlSg== X-Received: by 2002:a17:906:c57:: with SMTP id t23mr24954804ejf.355.1620718115576; Tue, 11 May 2021 00:28:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfNjpKGYfCiGVCGUihzIVh0RjrX7sKeJcCd4MdN5i53Jl91e1/5GKkA6qdcWS2e7lalm3KNw== X-Received: by 2002:a17:906:c57:: with SMTP id t23mr24954790ejf.355.1620718115410; Tue, 11 May 2021 00:28:35 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id ho32sm823433ejc.82.2021.05.11.00.28.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:28:35 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/2] UBUNTU: [Packaging] Add list of built-in modules to the ABI Date: Tue, 11 May 2021 09:28:33 +0200 Message-Id: <20210511072834.488740-2-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210511072834.488740-1-juergh@canonical.com> References: <20210511072834.488740-1-juergh@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 a new file /modules.builtin to the buildinfo package that lists all the built-in modules. This will be used by the ABI checker to not complain about missing modules if module configs have changed from 'm' to 'y'. Signed-off-by: Juerg Haefliger --- debian/rules.d/2-binary-arch.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 0b008df5a853..641a9f2938e5 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -459,6 +459,12 @@ endif find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \ sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $(abidir)/$*.modules + # Build the final ABI built-in modules information. + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin ] ; then \ + sed -e 's/.*\/\([^\/]*\)\.ko/\1/' $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin | \ + sort > $(abidir)/$*.modules.builtin; \ + fi + # Build the final ABI firmware information. find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \ while read ko; do \ @@ -499,6 +505,10 @@ endif $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/retpoline install -m644 $(abidir)/$*.compiler \ $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/compiler + if [ -f $(abidir)/$*.modules.builtin ] ; then \ + install -m644 $(abidir)/$*.modules.builtin \ + $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/modules.builtin; \ + fi ifneq ($(full_build),false) # Clean out this flavours build directory. From patchwork Tue May 11 07:28:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1476876 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 4FfV0B3S5Pz9t14; Tue, 11 May 2021 17:28:42 +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 1lgMoo-0001ij-3W; Tue, 11 May 2021 07:28:38 +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 1lgMom-0001iH-Gi for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:36 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lgMom-0006rZ-8x for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:36 +0000 Received: by mail-ed1-f69.google.com with SMTP id s20-20020a0564025214b029038752a2d8f3so10430315edd.2 for ; Tue, 11 May 2021 00:28:36 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6CiMkP8bMn4jj793FDpXCEA6MGkplc79FXJwa3jf46Y=; b=lnU4MFQrVnsLpLAuFVvjzazBdED5ili3olfv37hq/Wilq7e7FAVyRURW4+ThuOnIND rO/n8RLksD2oXjx5nQ5HUsEXry9o1NWRgLGj73DnLaJb1xASsdUCnHmyGl8CbjSgqHia 2AxrgfUb+ITdI46QFYU1a/nGddAEcjrwXY8cxm+l66K4KVNgT8NWdCP6RvkZVayUqkfa wGFjyV014DUqZHtzUXAl6Xyc1uvvFwj7HU+9/NVy7hyylSFbLtOdHG0vD65yjFCX3iUv Ftxg97KpN5NG8d+MIJMBd03STad8noEw8cFMSWcZg5JuOIxzitg6B+nH18p+lUr0Q2PT Bi2Q== X-Gm-Message-State: AOAM530q7n6UR7hOzOCD3mq3KnTp7gSJtzrPC35T3Gq6TH8onDHmwRig KAT+ImRgL8gY0ryLygfcuVgphaKC6S/adc4FrcW/jWknhylFV5CwpGrIwJzM9wUa6Bt7Bvg9GWu WpXHyzNBIGna+khA6zc+5Pi3rLyfQyW5Xbd2kRbVHQg== X-Received: by 2002:a05:6402:354b:: with SMTP id f11mr35139965edd.139.1620718115996; Tue, 11 May 2021 00:28:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAR8dclA6UFIc8iM5qGALpCQdZSvSM3HOEzSPZ0z3ZLnw54oXbjKYysUHJvuLB2+y7nPvEFw== X-Received: by 2002:a05:6402:354b:: with SMTP id f11mr35139951edd.139.1620718115840; Tue, 11 May 2021 00:28:35 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id ho32sm823433ejc.82.2021.05.11.00.28.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:28:35 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 2/2] UBUNTU: [Packaging] abi-check: Process modules.builtin Date: Tue, 11 May 2021 09:28:34 +0200 Message-Id: <20210511072834.488740-3-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210511072834.488740-1-juergh@canonical.com> References: <20210511072834.488740-1-juergh@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 previous commit introduced a new file modules.builtin that lists all built-in modules. Take the content of that file into account during the ABI check so that modules that changed from 'm' to 'y' don't result in a build failure. Signed-off-by: Juerg Haefliger --- debian/scripts/module-check | 56 ++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/debian/scripts/module-check b/debian/scripts/module-check index c754ea368cfb..fe2717044426 100755 --- a/debian/scripts/module-check +++ b/debian/scripts/module-check @@ -52,38 +52,50 @@ if (-f "$prev_abidir/../modules.ignore") { # Read new modules first print " reading new modules..."; $new_count = 0; -open(NEW, "< $abidir/$flavour.modules") or - die "Could not open $abidir/$flavour.modules"; -while () { - chomp; - $modules{$_} = 1; - $new_count++; +@files = ("$abidir/$flavour.modules"); +if (-f "$abidir/$flavour.modules.builtin") { + push(@files, "$abidir/$flavour.modules.builtin"); +} +for $file (@files) { + open(NEW, "< $file") or + die "Could not open $file"; + while () { + chomp; + $modules{$_} = 1; + $new_count++; + } + close(NEW); } -close(NEW); print "read $new_count modules.\n"; # Now the old modules, checking for missing ones print " reading old modules..."; $old_count = 0; -open(OLD, "< $prev_abidir/$flavour.modules") or - die "Could not open $prev_abidir/$flavour.modules"; -while () { - chomp; - if (not defined($modules{$_})) { - print "\n" if not $missing; - $missing++; - if (not defined($modules_ignore{$_})) { - print " MISS: $_\n"; - $errors++; +@files = ("$prev_abidir/$flavour.modules"); +if (-f "$prev_abidir/$flavour.modules.builtin") { + push(@files, "$prev_abidir/$flavour.modules.builtin"); +} +for $file (@files) { + open(OLD, "< $file") or + die "Could not open $file"; + while () { + chomp; + if (not defined($modules{$_})) { + print "\n" if not $missing; + $missing++; + if (not defined($modules_ignore{$_})) { + print " MISS: $_\n"; + $errors++; + } else { + print " MISS: $_ (ignored)\n"; + } } else { - print " MISS: $_ (ignored)\n"; + $modules{$_}++; } - } else { - $modules{$_}++; + $old_count++; } - $old_count++; + close(OLD); } -close(OLD); # Check for new modules foreach $mod (keys(%modules)) { if ($modules{$mod} < 2) {