From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +B5/AKNLmGP7AwAAbAwnHQ (envelope-from ) for ; Tue, 13 Dec 2022 10:53:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UNZlAKNLmGMhWwEAauVa8A (envelope-from ) for ; Tue, 13 Dec 2022 10:53:39 +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 A1C98392C0 for ; Tue, 13 Dec 2022 10:53:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p51yD-0000pW-5J; Tue, 13 Dec 2022 04:53:05 -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 1p51yB-0000ot-84 for bug-guix@gnu.org; Tue, 13 Dec 2022 04:53:03 -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 1p51yA-00076N-Vn for bug-guix@gnu.org; Tue, 13 Dec 2022 04:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p51y9-0002Zo-Ri for bug-guix@gnu.org; Tue, 13 Dec 2022 04:53: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 13 Dec 2022 09:53: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: Pierre Langlois Cc: 59913@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 59913-submit@debbugs.gnu.org id=B59913.16709251739898 (code B ref 59913); Tue, 13 Dec 2022 09:53:01 +0000 Received: (at 59913) by debbugs.gnu.org; 13 Dec 2022 09:52:53 +0000 Received: from localhost ([127.0.0.1]:59323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p51y0-0002Za-O5 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 04:52:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p51xy-0002ZS-4T for 59913@debbugs.gnu.org; Tue, 13 Dec 2022 04:52:51 -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 1p51xs-00073Z-Ph; Tue, 13 Dec 2022 04:52:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=DvmFJhCPN5P/1LOoDq6dfHGjmzvzqqOE1casMUPfs9k=; b=HLxIa3keZ53NpcfgVBDW vbpSggRl66UUDpFS4H2eNv2lEzi1jaSOWRS2tZYSE5J/K66UXH6bXSLZuGoUpHVTDbhv1QYX+o7ru VzUnH4feUl6xCeCh8C25ZnTyaXKUFbVUJNI0G7p7gwDv3WJ+6qZhwWCm9kXjEOQrjnQqjJqMwd1Lk owJ9KtT6OK5acdxzTh9WP2hp5/OGFDRYhYkdaUwo6YUt1+gugAiyxP1r2XsD4gbiqHO4m+cwomZjj uG5VbUH1dgoIHQLk9O35ttghrKVMz7BHEXqIgNURzxNwHJMQOBHY1InSEn0/LObzE3wbZJHvmoobT JGVXiIUbEjUeuA==; Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p51xr-0001cB-VE; Tue, 13 Dec 2022 04:52:44 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <167059225344.15591.17976801315617510996@vcs2.savannah.gnu.org> <87k030wfhu.fsf@gmx.com> <87ilik5oks.fsf@gmail.com> <87sfhouskl.fsf@gmx.com> Date: Tue, 13 Dec 2022 10:52:41 +0100 In-Reply-To: <87sfhouskl.fsf@gmx.com> (Pierre Langlois's message of "Fri, 09 Dec 2022 21:33:29 +0000") Message-ID: <87fsdjy6ja.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670925218; h=from:from:sender:sender: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: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:dkim-signature; bh=DvmFJhCPN5P/1LOoDq6dfHGjmzvzqqOE1casMUPfs9k=; b=EoC/2eKnDrObF0p15/bE0p6zYqzxN7CUvWV11bp9plAbO667pmtNPtzrPPM9wV19Gj0HkB PBrRInVbWli9/5ciSMuj7VypBANfXfCWG2Pn83aM8b/PUbbsoBQBDPJ56tJ8PNVQ6hqOLB TgxKE6rNhh+B9kAr4tWxL0MuFvuF5EYg4OHLywPR+bK6Fx74C8uZn+lsZ6duXVUSTMSftG /jm7HAYgAcHHXWDpf6lp0vFo9vhbqZnBwJHSjA++HvZI7VHeeu+TO0X9IR2w3vAAYmUsxx ev6j6JPk2nBGkVbSXq/dODTd40ldWhACqkqGlp2zRwc+kccH7qTSzxD89hEYLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=HLxIa3ke; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670925218; a=rsa-sha256; cv=none; b=dbagXcPnQj2i3bUS+8pkf89euyqfXONEm+Mb3HgEjzUai3Hd7iHIQ88vIy5UqadJiXNOCV PyZTt0i/cE+mjec1osdF5o7Jr4WUwOAz1msKvEGCFn9UTmkkGG+MBBe9dIFjtGfZgEv3c8 iDWlhuY+8xMxydogeRu5sI3ijNRZWpRPMVxgxuoFz8/yDmQQEpZu3dEwXo2U8NAi+wO6XU RHaHXZjJtHfZZPP9ayOn8dFbRKDQxknTY38XCXBoUjLjs0+Ado2gwnEGQqiRXpE0Q0uGSv cPJvAkgfYxu8pmvA3kAi+8e4R6J1MoJOfhh/abXUhZW1msaNTGWgkgA0IiryeQ== X-Migadu-Spam-Score: -3.47 X-Spam-Score: -3.47 X-Migadu-Queue-Id: A1C98392C0 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=HLxIa3ke; 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"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: zEjPWBFVniiY Hi, Pierre Langlois skribis: > I'm not sure I follow, I'd suggest to revert the revert and then apply a > fix in the same commit, that way it can easily be reverted again if it's > problematic, that's probably what you meant already? Sounds good to me. The commit log can be similar to the original one (rather than =E2=80=9CRevert: "Revert: "whatever"=E2=80=9D), with a couple = of lines like: This restores commit XYZ, with an additional fix for =E2=80=A6 Fixes . > I think the following fix should do it, just to make sure the > `kernel-config' function returns #f on unsupported systems, as per its > docstring: > > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 5ae6366593..2d0d1aa29f 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -781,8 +781,10 @@ (define* (kernel-config arch #:key variant) > ARCH and optionally VARIANT, or #f if there is no such configuration." > (let* ((name (string-append (if variant (string-append variant "-") "") > (if (string=3D? "i386" arch) "i686" arch) = ".conf")) > - (file (string-append "linux-libre/" name))) > - (local-file (search-auxiliary-file file)))) > + (file (string-append "linux-libre/" name)) > + (config (search-auxiliary-file file))) > + (and config > + (local-file config)))) LGTM! Thanks, Ludo=E2=80=99.