From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iK+YDEx7kmNfqwAAbAwnHQ (envelope-from ) for ; Fri, 09 Dec 2022 01:03:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OOydC0x7kmMndgAAG6o9tA (envelope-from ) for ; Fri, 09 Dec 2022 01:03:24 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F23332D85B for ; Fri, 9 Dec 2022 01:03:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Qr3-0005EP-UT; Thu, 08 Dec 2022 19:03:06 -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 1p3Qr1-0005Dv-WC for bug-guix@gnu.org; Thu, 08 Dec 2022 19:03:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Qr0-0002db-N3 for bug-guix@gnu.org; Thu, 08 Dec 2022 19:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Qqz-0007dm-V8 for bug-guix@gnu.org; Thu, 08 Dec 2022 19:03:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#59913: [tentative PATCH] Failure to guix pull on aarch64 since recent make-linux-libre* Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 09 Dec 2022 00:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59913 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 59913@debbugs.gnu.org Received: via spool by 59913-submit@debbugs.gnu.org id=B59913.167054412729359 (code B ref 59913); Fri, 09 Dec 2022 00:03:01 +0000 Received: (at 59913) by debbugs.gnu.org; 9 Dec 2022 00:02:07 +0000 Received: from localhost ([127.0.0.1]:59918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3Qq7-0007dT-0C for submit@debbugs.gnu.org; Thu, 08 Dec 2022 19:02:07 -0500 Received: from mout.gmx.net ([212.227.17.20]:38863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3Qq4-0007d6-Tx for 59913@debbugs.gnu.org; Thu, 08 Dec 2022 19:02:05 -0500 Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MA7KU-1pDptM1SJe-00Bdiz for <59913@debbugs.gnu.org>; Fri, 09 Dec 2022 01:01:58 +0100 References: <87k031xxss.fsf@gmx.com> User-agent: mu4e 1.8.11; emacs 28.2 From: Pierre Langlois Date: Thu, 08 Dec 2022 23:59:11 +0000 In-reply-to: <87k031xxss.fsf@gmx.com> Message-ID: <877cz1xx59.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:+y/W2ChzcVXeOlk2bIPvrF1lX/9rxEOXHGYwZfmj3QKkCWaTcuz y8a6VgOzpeFtGZIO1J/t1R8hIoU0Omc8GU/S81bf4nuDsiaMqZ9nNNcxQVl8aFDlGlF2g9A PF1E8SdyWs6Fl/9GMXOCpvnK2KrfmU+C821jzsiNYOzK5AF5tWQ1+8NL3PumMRo0p6h0xr/ ydEnHPeBchPJHBmJh0aaw== UI-OutboundReport: notjunk:1;M01:P0:ZTQUQUsV2sE=;C+pNHRLOTBLBm524Nbck6vRcgu+ unTE0JCbifI3iWE/AimVF2gwuv5noXqhgBAyUFU7+D6oIiAuhzQ0B68nAXC41BEKwkeecWi3M Zt5+h1/agAxqPjC5qDEL7+Xs03QuX2mVhLlSmCTqoqrUc1Gs2AfEK16Y3IcjF6E28QjQqeBjn ln2gjcFni1qTrrua0u/wxHqPjb2kqQZNVbhDQL1Q/4XcFm8o7pHSU0EV0s+kfzZ/vpfacxIqc ADrihTCDFl7LqYQvr7WNBZHoY2i9eawdCNgJZ9DLNjXGshe8N1MgX75F7yTLDLHD5QEwMdvoT 4DeueCB5Q7UtMtnWPuoTzuoQF+zs9gcRCYEC8Zbbv2fLNFoE+yVy0Vf62ieWjLMW53wt4FA2e Hp8uPYCct0CwyeLNa792YgMNhv2RK+qwbB+xWTS67kyTgdpxwWPR5j6KK4RnRBtqug28YkI2e OuTZJKapKxLLSG6O2QFvZ16+O48mvZ+TK6OReUw5Ot2Z/MU/SqhxIyFEQJpDAVjKyTO2+sDP6 3OyE7IWg/sB/MsZLK+exAGNeq71yziyoMiI+SOGBPXPGiBgXaFXeSAvRKpqeQMsAGiMhdpC+j 9Be2RCedAqx+AyDJCAeiOia9wgyoqGXy8fXQ6t0EwwL6LtVIKCSKYlAbAekx/z0nmFMH9dOCx cg1aAY2d2LGMQLlaea1T9KSJu1reP8EAxz5If63bCL5t2LtTAbdu/lgcvnRyf/rMnvvqWMt5e SH+AoSGMKDUq1hLaSxjuZYatlbtfnXWIjlE9pVO9KgAYkxzjXDAcBmGfVIcAi2SqqnoZqyNBl M7L0aB0W3M/j3bLuCgAjBHQ//4mkvpQBfUtUYr2LSCnObo4kNK6fo+xceOsVGpvEq/Dmk1Ut7 9Vart//YVlmfZRpzwiIzSuLmH39fMxfCty6+ghc6XJxyTtB4WwX8uv6Wo8kBnXsmv1s3u8Y9c k4HoKg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670544204; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=/zp7j5j6gYIKB6oEzuHuzOXCdkUwpE2HIjeAz/iyVVQ=; b=uvPTl/qjA//0IgBp7/YIf0mH/FssV4KY+4wJ5xfmvd5mfKcGbGrqfiIEwUrAraHayb/DEk mEnAOVvDaJ+e3XFoaH3SwLjSxxOTmpLOJ7K+YJh2uDA4aiAKQDsPWXsppCN/d3X51EI+Fd 4a9U9DTrwYMhAvqQfCfsA+8i6YrvlXZHcE/GDXaZKH3ZiHETnRJeEvUwz0wHwbybPhYKnR s8rifJ2Na5os5HQvMJuD3zQxCf9oEVlTaOltKZPOb9QkqAwVOTJDck0HXCEfqIWjfzWEsu k+r09l4OA9KuQj1YSaPwti1nQw1mcSvsZTWM5cUzT4PmBHEhY3Io/FB0VHtnxw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670544204; a=rsa-sha256; cv=none; b=nETjBDdXcP9hoia6suALeCtUmJJUvkXgR/2fRDMlETiYsBZtML9hhUzbpys5GuFCgw+GJC npL+7ntd1ONVBml+Z7Ates/ytGuPkibcSpMTFH3fUF21IfBPLefMF19v1NOjPoOQt4pE21 xZJEgXDVidWwbC5P7Vwnx/DN300lXkRh8806o/DjgtU9tKHSvO9EXvvp/FoEjkCAcQKMOn 4+KyU3pQMx4CWp0FoKdFTlrJuHx+Jl1vTlxjz8LIfSkjA1dGWqzN0cUMDB4L7RSXutG/eB Rwj3D3MFn+h/UGhA5KJHjvyeXXAXZmaBEcV+aZ7LTSjpnRAWEGGg/+9WQrr6dA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 1.34 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: F23332D85B X-Spam-Score: 1.34 X-Migadu-Scanner: scn1.migadu.com X-TUID: h9P70cS0KEaR --=-=-= Content-Type: text/plain Pierre Langlois writes: (snip) > What seems to happen is that the `kernel-config' function now receive an > `arch' argument for an architecture that isn't actually supported by > that kernel, as is the case for linux-libre@4.14.300. And, correctly, > the function should not expect to ever get such arch value to begin > with, so we get a `(local-file #f)'. > > (define* (kernel-config arch #:key variant) > "Return a file-like object of the Linux-Libre build configuration file for > ARCH and optionally VARIANT, or #f if there is no such configuration." I pasted this bit of code but didn't read it properly, it specificaly says that it should return #f if the config doesn't exist. I guess that's now a bug? We could either fix the docstring and apply the fix I proposed, or returning #f probably works. > (let* ((name (string-append (if variant (string-append variant "-") "") > (if (string=? "i386" arch) "i686" arch) ".conf")) > (file (string-append "linux-libre/" name))) > (local-file (search-auxiliary-file file)))) > > I think it's fair for that function expect the arch to be valid (why > would you ask the config for an unsupported arch?). > > I think it should be possible to fix this by checking the arch is > supported at the call site: > > [[End of PGP Signed Part]] > From 77829140f14928e30cbe4e53c625be3ba2f5895f Mon Sep 17 00:00:00 2001 > From: Pierre Langlois > Date: Thu, 8 Dec 2022 23:41:40 +0000 > Subject: [PATCH] gnu: make-linux-libre*: Do not get config for unsupported > systems. > > * gnu/packages/linux.scm (make-linux-libre*)[phases] : Check > arch is in supported-systems before calling configuration-file. > --- > gnu/packages/linux.scm | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 5ae6366593..87fc9fe94c 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -983,6 +983,7 @@ (define* (make-linux-libre* version gnu-revision source supported-systems > (or (%current-target-system) > (%current-system)))))) > (and configuration-file arch > + (member arch supported-systems) > (configuration-file > arch > #:variant (version-major+minor version)))) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmOSevIYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UIhIIALumkA1Oja+cX7D5iJdC/Ocr 69JvMYdWX5ezWn6Ne/kJQj8fvhQPn2csDDTl0WgO6/RF41GUlF6MfhkRs7s2WLJh meVOx1iA7FLMn4d4OZfo+XGfK7Zb5ZpF1U+PBZtnVRdffBkCSdfFfxZd5uUT5QtL E8UEUUT7MdrTtI24Fa+BWiaFMT3pK29YJr5fXNiERHtpA92uQFa36iGcGrxZ0qdd Dmtyo1yNbLKYBQ2iLF+bxzAMNv0ErkN9tDKLYMuBg28+Wk3I1k1acV9fTU2wdcO3 pm8XCh/VvCAMzEuzQTtb8GmMp6lDXrPnJ+n80+ai2aVhJwSwWpE8o/Wa4rPkv1w= =ojPn -----END PGP SIGNATURE----- --=-=-=--