From: "Ludovic Courtès" <ludo@gnu.org>
To: Pierre Langlois <pierre.langlois@gmx.com>
Cc: 59913@debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: bug#59913: [tentative PATCH] Failure to guix pull on aarch64 since recent make-linux-libre*
Date: Tue, 13 Dec 2022 10:52:41 +0100 [thread overview]
Message-ID: <87fsdjy6ja.fsf_-_@gnu.org> (raw)
In-Reply-To: <87sfhouskl.fsf@gmx.com> (Pierre Langlois's message of "Fri, 09 Dec 2022 21:33:29 +0000")
Hi,
Pierre Langlois <pierre.langlois@gmx.com> 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 “Revert: "Revert: "whatever"”), with a couple of lines
like:
This restores commit XYZ, with an additional fix for …
Fixes <https://issues.guix.gnu.org/59913>.
> 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=? "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’.
next prev parent reply other threads:[~2022-12-13 9:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <167059225344.15591.17976801315617510996@vcs2.savannah.gnu.org>
2022-12-09 19:18 ` bug#59913: branch master updated: Revert "gnu: make-linux-libre*: Remove input labels." Pierre Langlois
2022-12-09 20:06 ` Maxim Cournoyer
2022-12-09 21:33 ` Pierre Langlois
2022-12-13 9:52 ` Ludovic Courtès [this message]
2023-01-13 21:04 ` bug#59913: [tentative PATCH] Failure to guix pull on aarch64 since recent make-linux-libre* Maxim Cournoyer
2022-12-08 23:31 Pierre Langlois
2022-12-08 23:59 ` Pierre Langlois
2022-12-09 0:36 ` Pierre Langlois
2023-01-13 15:39 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fsdjy6ja.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=59913@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=pierre.langlois@gmx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).