From unknown Fri Jun 20 07:11:17 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#69400 <69400@debbugs.gnu.org> To: bug#69400 <69400@debbugs.gnu.org> Subject: Status: [PATCH] linux-initrd: Avoid looking up builtin modules. Reply-To: bug#69400 <69400@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:11:17 +0000 retitle 69400 [PATCH] linux-initrd: Avoid looking up builtin modules. reassign 69400 guix-patches submitter 69400 Hilton Chain severity 69400 normal tag 69400 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 26 01:07:33 2024 Received: (at submit) by debbugs.gnu.org; 26 Feb 2024 06:07:33 +0000 Received: from localhost ([127.0.0.1]:34340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reU9E-0005cX-Mz for submit@debbugs.gnu.org; Mon, 26 Feb 2024 01:07:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:50632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reU9C-0005cO-Ee for submit@debbugs.gnu.org; Mon, 26 Feb 2024 01:07:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reU8m-0002PK-Um for guix-patches@gnu.org; Mon, 26 Feb 2024 01:07:04 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reU8k-0003Ev-7z for guix-patches@gnu.org; Mon, 26 Feb 2024 01:07:04 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708927602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Z/IowYfRXkmfWhiMjz0q5KT9P+Y1v9NNrcKOOGtrjQ=; b=xSIBHos3P/ue17R1L9qMGC3QGsBOeQf1ZbRFVbL01JpKUC5KrSiDONfqIBVoRlijErMGLh Uroa7Uh215V066lQFYz1CMfYJICRybHVXANGKOTU4rZI3kLuLhH929hkvt23fc8OXkYost u7O5HI4XxOqqzywo9xiqT+BhrAJub+uX3B3fQSP4MmQCDVPpvxe8XkRsxJpIAVy9EFnb0D voWAAicN10n66NHnXz3WJm4zKg5WBjZJ2SSKNW2dfIRfFJVwF925OhtSde9IGudnrALnJK Rt5kZyxr0dSy8okfxGbmQ+pJQkT4QT7unVNGjlhPfzb+eYkjHXFAzLbQkQmevQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: guix-patches@gnu.org Subject: [PATCH] linux-initrd: Avoid looking up builtin modules. Date: Mon, 26 Feb 2024 14:06:23 +0800 Message-ID: <7256f0ce334fc064a904e6d9748e9ccc7e67dfda.1708926797.git.hako@ultrarare.space> MIME-Version: 1.0 X-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/system/linux-initrd.scm (flat-linux-module-directory) [build-exp]: New variables. : Use ‘modules-to-lookup’ to avoid looking up builtin modules. Change-Id: I60fdae0211bb6632508b1c63582e013e78186cd1 --- gnu/system/linux-initrd.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 5847f52a37..25563b703f 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -132,15 +132,27 @@ (define (flat-linux-module-directory linux modules) #~(begin (use-modules (gnu build linux-modules) (guix build utils) + (rnrs io ports) (srfi srfi-1) (srfi srfi-26)) (define module-dir (string-append #$linux "/lib/modules")) + (define builtin-modules + (call-with-input-file + (first (find-files module-dir "modules.builtin$")) + (lambda (port) + (map file-name->module-name + (string-tokenize + (get-string-all port)))))) + + (define modules-to-lookup + (lset-difference string=? '#$modules builtin-modules)) + (define modules (let* ((lookup (cut find-module-file module-dir <>)) - (modules (map lookup '#$modules))) + (modules (map lookup modules-to-lookup))) (append modules (recursive-module-dependencies modules base-commit: b25b94335a3ee8d68d2145da8e5ea0325ecea451 prerequisite-patch-id: c615f2b08070db6cbe847a2bdd5b7c0aae79789b prerequisite-patch-id: fd7da036342f36a8c698f5c8975f9e48d3ade435 prerequisite-patch-id: a2c81c14423bb9858f33d7d26976e8eea61982b7 prerequisite-patch-id: e30fd25b1dc4aaaff76474153836cd48e8565eb9 prerequisite-patch-id: 1d070b26dc64ee2ec95f14c4f5fc23419f766810 prerequisite-patch-id: 03de992f0312d5f0ee3368ebc3c1fad7c955d095 prerequisite-patch-id: b330efe2b0713e30b766c3b84643df67eb1eae5d prerequisite-patch-id: a233d53e8895d3f82af872fffb2e3858f44ceb23 prerequisite-patch-id: a2b6bd60bc05d7b5a75f15a06b1b614afd6a7033 prerequisite-patch-id: f2a0189de95456f15ec6a92526c72fbedb74f359 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 06 17:22:36 2024 Received: (at 69400) by debbugs.gnu.org; 6 Mar 2024 22:22:36 +0000 Received: from localhost ([127.0.0.1]:51830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhzel-0006k1-JN for submit@debbugs.gnu.org; Wed, 06 Mar 2024 17:22:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhzea-0006jd-9r for 69400@debbugs.gnu.org; Wed, 06 Mar 2024 17:22:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhzdz-0007pA-Jm; Wed, 06 Mar 2024 17:21:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=3FTWj0TC2zVpRLM2o9gcmPesY7eNR37PjicJ7BIyX6g=; b=aqYha2S43WNzpz9UKKyJ ICVP60sb/1S4+HiJCCFwzv4WBHxOK96vKHiWJMIqx9vaRQ16MzfBt/MMdX7tlaiofozkxieF5kAo6 O98hzF2tWgL1NZAmFqRhAuEIKvNmiwCw6UQYkXucBSqbOJD/a5svNpCLjjI8PRc2UKg6Vb7mL7HAF AmJTrYUfuzOU3lZxyZnZVvTctRsY2CSy2bNIWGGo+dFEmCCJUMCsUKqgYyx/6J3YziRpIQXKzE77L UV/DnykBtATEdi2qJAv0cXmlHfSrwSfUNcwWd74P6CYhy/jbNav4FJO4S3dI+QQA4+Zejm8ntCTcj gumUvnd0sXZGOg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Hilton Chain Subject: Re: [bug#69400] [PATCH] linux-initrd: Avoid looking up builtin modules. In-Reply-To: <7256f0ce334fc064a904e6d9748e9ccc7e67dfda.1708926797.git.hako@ultrarare.space> (Hilton Chain's message of "Mon, 26 Feb 2024 14:06:23 +0800") References: <7256f0ce334fc064a904e6d9748e9ccc7e67dfda.1708926797.git.hako@ultrarare.space> Date: Wed, 06 Mar 2024 23:21:45 +0100 Message-ID: <87r0gn6lxi.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69400 Cc: Wilko Meyer , 69400@debbugs.gnu.org, Tobias Geerinckx-Rice , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Hilton Chain skribis: > * gnu/system/linux-initrd.scm (flat-linux-module-directory) > [build-exp]: New variables. > : Use =E2=80=98modules-to-lookup=E2=80=99 to avoid looking up bu= iltin modules. > > Change-Id: I60fdae0211bb6632508b1c63582e013e78186cd1 Good catch! Did you experience build failures because of that? (Namely, the machinery looking for modules that didn=E2=80=99t exist.) LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 22:22:13 2024 Received: (at 69400-done) by debbugs.gnu.org; 9 Mar 2024 03:22:13 +0000 Received: from localhost ([127.0.0.1]:60037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rinHp-0002qI-A6 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 22:22:13 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:34256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rinHn-0002qA-NU for 69400-done@debbugs.gnu.org; Fri, 08 Mar 2024 22:22:12 -0500 Date: Sat, 09 Mar 2024 11:17:51 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1709954461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qiEplbmt7bk7is8NmoT/lzR1FNk2Vm1ovKqGxBR4av0=; b=Jfy4b3rnvOoexI39CLDcAmueQM7H1LmWK0n/S6dPaahHq5Kwag0hpqtDoBmuLC/lZuxek2 IS/5s4zB+DHo5dl3ysI1QlsgR/JL0lxC50ArLb/WGGYTa+eXp4bYmD90R9rrjaqEnf1U9B pmYGU/9eL4WueC03V95lMQfa6+JimOD6CkP+O8HQiGPiGjyYpQjEGzJpe6X0gSRAs2ZOKq Yj4oBvqkaOWUpmcnEm+xze6NAv2If0MiVZYl4Wquhu7rdLFZlNYNvRoGOHDVsNjN2WF49v 4OzPpqRVytL2Pu4pHuNEjxw+eI8uc0bVjtGOZKPmnX5Q/OM1alZUa+F/Jw6/ww== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <874jdgt7og.wl-hako@ultrarare.space> From: Hilton Chain To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Subject: Re: [bug#69400] [PATCH] linux-initrd: Avoid looking up builtin modules. In-Reply-To: <87r0gn6lxi.fsf@gnu.org> References: <7256f0ce334fc064a904e6d9748e9ccc7e67dfda.1708926797.git.hako@ultrarare.space> <87r0gn6lxi.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: base64 X-Spamd-Bar: - X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69400-done Cc: Wilko Meyer , 69400-done@debbugs.gnu.org, Tobias Geerinckx-Rice , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) SGksDQoNCk9uIFRodSwgMDcgTWFyIDIwMjQgMDY6MjE6NDUgKzA4MDAsDQpMdWRvdmljIENvdXJ0 qKhzIHdyb3RlOg0KPg0KPiBIaSwNCj4NCj4gSGlsdG9uIENoYWluIDxoYWtvQHVsdHJhcmFyZS5z cGFjZT4gc2tyaWJpczoNCj4NCj4gPiAqIGdudS9zeXN0ZW0vbGludXgtaW5pdHJkLnNjbSAoZmxh dC1saW51eC1tb2R1bGUtZGlyZWN0b3J5KQ0KPiA+IFtidWlsZC1leHBdPGJ1aWx0aW4tbW9kdWxl cyxtb2R1bGVzLXRvLWxvb2t1cD46IE5ldyB2YXJpYWJsZXMuDQo+ID4gPG1vZHVsZXM+OiBVc2Ug oa5tb2R1bGVzLXRvLWxvb2t1cKGvIHRvIGF2b2lkIGxvb2tpbmcgdXAgYnVpbHRpbiBtb2R1bGVz Lg0KPiA+DQo+ID4gQ2hhbmdlLUlkOiBJNjBmZGFlMDIxMWJiNjYzMjUwOGIxYzYzNTgyZTAxM2U3 ODE4NmNkMQ0KPg0KPiBHb29kIGNhdGNoISAgRGlkIHlvdSBleHBlcmllbmNlIGJ1aWxkIGZhaWx1 cmVzIGJlY2F1c2Ugb2YgdGhhdD8NCj4gKE5hbWVseSwgdGhlIG1hY2hpbmVyeSBsb29raW5nIGZv ciBtb2R1bGVzIHRoYXQgZGlkbqGvdCBleGlzdC4pDQo+DQo+IExHVE0sIHRoYW5rcyENCg0KDQpZ ZXMsIEkgYWN0dWFsbHkgZW5jb3VudGVyZWQgdGhlIGlzc3VlIGJhY2sgdG8gdGhlIGZpcnN0IHRp bWUgY3VzdG9taXppbmcgYQ0Ka2VybmVsIHdpdGggR3VpeCBTeXN0ZW0hDQoNClJlY2VudGx5IEkg dHJpZWQgdG8gd3JpdGUgYSBzY3JpcHQgdG8gZW5hYmxlIGFsbCBwb3NzaWJsZSBtb2R1bGVzIGZv cg0KKGdudSBzeXN0ZW0gbGludXgtaW5pdHJkKSBhbmQgcmVhbGl6ZWQgIkNPTkZJR19DUllQVE9f RUNCIiAocmVxdWlyZWQgZm9yIENJRlMNCnN1cHBvcnQpIGluIGRlZmNvbmZpZyBmb3IgcGFydCBv ZiBvdXIga2VybmVscyBhcmUgc2V0IHRvIGJ1aWx0LWluLiAgQXMgYSByZXN1bHQsDQpJIHRoaW5r IGl0J3Mgbm93IG5lY2Vzc2FyeSB0byBtYWtlIGEgY2hhbmdlIHdpdGhpbiBHdWl4IGluc3RlYWQu IDopDQoNCkFwcGxpZWQgYXMgOGY4ZWM1NjA1Mjc2NmFhNTEwNWQ2NzJiNzdhZDllYWNhNWMxYWIz Yy4NCg0KVGhhbmtzDQo= From unknown Fri Jun 20 07:11:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 Apr 2024 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator