From patchwork Fri Dec 10 15:41:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1566547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=ODLEJsVN; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J9ZrP3mBhz9sR4 for ; Sat, 11 Dec 2021 02:41:24 +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 1mvi1I-0003Kc-4A; Fri, 10 Dec 2021 15:41:12 +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 1mvi1F-0003K9-MC for kernel-team@lists.ubuntu.com; Fri, 10 Dec 2021 15:41:09 +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-0.canonical.com (Postfix) with ESMTPS id 761363F1E6 for ; Fri, 10 Dec 2021 15:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639150869; bh=rZcvGWK/i/fdazWqqeZsZz11uqEvyd6Vh9UXJt8iIL4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ODLEJsVNOXcYF2WTm4M1t8oFS6qjZg28O5FJJaGzd8Y0sZNjxWDz465Cwd43efqSb NqWPO3W2R6V8/ZCrM5lRGkSvYhVIu6/kDdks2w99ogGQA2aX5k0YyY5MXKTl8jeHKJ iudHPllxa8JThyRvN/I/t44KP0DDV6Mk3+93GkDtdKd32GQ50UjH+yZug32b1zKTqa 7G8nsTrFaKDPcYc98JYWKhVfnWZA+o2LuIiT0JaPK2t52UK4AcYmacA1tV8WRAltOm KXXuj9HobeeMqHatmRdhpfsBccc7fFg82mWdFyijxAfKkCSy0OKGb/uSolXruZzq6E zdPVpMe7rmBKQ== Received: by mail-ed1-f71.google.com with SMTP id c1-20020aa7c741000000b003e7bf1da4bcso8455814eds.21 for ; Fri, 10 Dec 2021 07:41:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rZcvGWK/i/fdazWqqeZsZz11uqEvyd6Vh9UXJt8iIL4=; b=KxQziQu8gqVc0qbiCud5OPzlflqt0jGZLi0aBRACdXJFL9T+AHXtiXfV1HWaLOprBQ 4IG04R16bdnF0TdOSvudZRv7HL5Tu9W684HOaYHTxFL/lwOHhfnDBzj9K30twheJVWTu OrcPScCVqVbWzH4N4424OHCgTMjFqXyQSqC60USul7I2ArXM5yUWtbY+TYlS9LVkqXZe fXy0YIS3691wJhP4M0TIid4KuWD66E7yWcY8FwZWfoGzcyvJpfQuBWeCL3fM+Gd2g1Oq s+NN5bdsEk9JVeBA7S71/h9sw+tp5ycaVSsApioi2UWs9y5cmNdKDqDByC1m/lq0w+Oi q/Ig== X-Gm-Message-State: AOAM531L4Hk6t0jh3aOLOLAniyNiuuvhZD8hqlxI+8JHeoTyy7yRG+qx 0L8WgmKwXOhIIvgwa+hpuTBY5uhYBXU0tnUbJviN/p9RCJQ7FUf1aL6/9u12eqLovqJSKh+3u4F EpTrHtqIlJ3lyaLxoqY4QUe0XZ/S5T0qynMwQJjiEyw== X-Received: by 2002:a17:906:eb8a:: with SMTP id mh10mr23657276ejb.198.1639150868927; Fri, 10 Dec 2021 07:41:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwHS3Vsspjm7jG2n2GEcu6uYvX9sOmBPCz7MEDY+YwikUWeFoy/1xP7YVXH7cKWabTBNRnUNg== X-Received: by 2002:a17:906:eb8a:: with SMTP id mh10mr23657253ejb.198.1639150868711; Fri, 10 Dec 2021 07:41:08 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id go17sm1606496ejc.76.2021.12.10.07.41.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 07:41:08 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [J][PATCH 1/2] UBUNTU: [Packaging] Add list of built-in modules to the ABI Date: Fri, 10 Dec 2021 16:41:06 +0100 Message-Id: <20211210154107.1551599-2-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211210154107.1551599-1-juergh@canonical.com> References: <20211210154107.1551599-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 f5ce021276c9..996512f9ce0b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -449,6 +449,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 \ @@ -489,6 +495,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 Fri Dec 10 15:41:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1566545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=SGPS+VZX; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J9ZrP4XJkz9sRK for ; Sat, 11 Dec 2021 02:41:24 +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 1mvi1I-0003Kp-9a; Fri, 10 Dec 2021 15:41:12 +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 1mvi1G-0003KG-53 for kernel-team@lists.ubuntu.com; Fri, 10 Dec 2021 15:41:10 +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 DDCC73F1AE for ; Fri, 10 Dec 2021 15:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639150869; bh=E6KhCOWR6Q9gnKp2RPsHH3qOv3Dm5iaZ6DHPccIT7pY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SGPS+VZXUA7FyqCgVfEIe7sBLx691tZjtb2Y5NbKgvbfhl9mBo/ZUTKS2BaHgwL0d iI1H2BepeflkwVCbVRNtB+7ICYSGQMlhZZNhq9+WIOsy0bVN02Up44PxJbOmK9fOaP 3DZziPNNzG6uAr2DkfhR9k786MRshl9jhs8jNN11/7DjTRoEO8TQvYPI0KheDnRTGo mGyakmAqfcC4fTuptJXQxNxnCVblMjDuBv/DIcp3BHsvwhXz0B4BB5SWpoG8yk2hmM MCpbytEk2hhFwyFor+lql8232VXcrovu7U5wzzU1bZYPznhg4NplUs0sthSmOG2Stb NW6PBJRGBmbkA== Received: by mail-ed1-f71.google.com with SMTP id y9-20020aa7c249000000b003e7bf7a1579so8535400edo.5 for ; Fri, 10 Dec 2021 07:41:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E6KhCOWR6Q9gnKp2RPsHH3qOv3Dm5iaZ6DHPccIT7pY=; b=Vtd8oOOB4253TIyo7C4lEV+PU7oGWz+kjjvuWFCM5u8Fnqnwqw4xGCvLHmrl5e+AYG 6Us+rKGy1psWiO2Z+92KsE3pYCae4uwWLF/71k7rR6ArnLJaOi7e0w0sRAgiC0bbZpU1 Q60Ix/m//8uWrofP4uvBRXgUlCIJK+HMYigtjpoZr918146KoS4Nn5wya+fZAheKDzgJ tfUVfexQ3i9zdmggg3mC8O0ajo/hSGzlv5SOFstUKwIzHfk97ie/+bdv2AuJnq1O1I6t P7n+T7M5T5U3y1uh3tWAD/xhqrOcigNRrLEcWc0zDuFGhpcqi7co6Kf1jNyERcnJyNM1 Bk+A== X-Gm-Message-State: AOAM533CR9kmBQtgr1ht02akeAk9S21T57+inOsrRi3ThGEup07VUy/8 fyx/hDHma5Aj6rfptT17UANIpy0X35ZnSrizq33QOmwDxqMtWOZX6fId40X22LUiNEo3WOpM9O0 kNEtEPrS+t1R+FPgNz/1zU6RqdkXP5ROzQOx9dVqkgw== X-Received: by 2002:a05:6402:90e:: with SMTP id g14mr40682506edz.49.1639150869587; Fri, 10 Dec 2021 07:41:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvHpe/qZ+Uz1hphP4HsvwSSTuxHzHfPsfe8g2YaLHzd0zd17AQPsmhtEFxCbIT5Ys4MZrPmA== X-Received: by 2002:a05:6402:90e:: with SMTP id g14mr40682473edz.49.1639150869373; Fri, 10 Dec 2021 07:41:09 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id go17sm1606496ejc.76.2021.12.10.07.41.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 07:41:09 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [J][PATCH 2/2] UBUNTU: [Packaging] abi-check: Process modules.builtin Date: Fri, 10 Dec 2021 16:41:07 +0100 Message-Id: <20211210154107.1551599-3-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211210154107.1551599-1-juergh@canonical.com> References: <20211210154107.1551599-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 | 43 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/debian/scripts/module-check b/debian/scripts/module-check index ef616f23ca5a..e33a4f0e1c03 100755 --- a/debian/scripts/module-check +++ b/debian/scripts/module-check @@ -52,30 +52,37 @@ if os.path.exists(prev_modules_ignore): # Read new modules first print(' reading new modules...', end='') new_count = 0 -with open(curr_modules) as fh: - for mod in fh: - mod = mod.strip() - modules[mod] = 1 - new_count += 1 +for f in (curr_modules, curr_modules + '.builtin'): + if not os.path.exists(f): + continue + with open(f) as fh: + for mod in fh: + mod = mod.strip() + modules[mod] = 1 + new_count += 1 print('read {} modules.'.format(new_count)) # Now the old modules, checking for missing ones print(' reading old modules...', end='') old_count = 0 -with open(prev_modules) as fh: - for mod in fh: - mod = mod.strip() - if mod not in modules: - if not missing: - print() - missing += 1 - if mod not in modules_ignore: - print(' MISS: {}'.format(mod)) - errors += 1 +for f in (prev_modules, prev_modules + '.builtin'): + if not os.path.exists(f): + continue + with open(f) as fh: + for mod in fh: + mod = mod.strip() + if mod not in modules: + if not missing: + print() + missing += 1 + if mod not in modules_ignore: + print(' MISS: {}'.format(mod)) + errors += 1 + else: + print(' MISS: {} (ignored)'.format(mod)) else: - print(' MISS: {} (ignored)'.format(mod)) - else: - modules[mod] += 1 + modules[mod] += 1 + old_count += 1 # Check for new modules for mod, cnt in modules.items(): if cnt < 2: