Maxim Cournoyer <maxim.courno...@gmail.com> writes: > Hi Pierre, > > Pierre Langlois <pierre.langl...@gmx.com> writes: > >> Hi Maxim, >> >> guix-comm...@gnu.org writes: >> >>> This is an automated email from the git hooks/post-receive script. >>> >>> apteryx pushed a commit to branch master >>> in repository guix. >>> >>> The following commit(s) were added to refs/heads/master by this push: >>> new 0ffa501f2b Revert "gnu: make-linux-libre*: Remove input labels." >>> 0ffa501f2b is described below >>> >>> commit 0ffa501f2b3e83ae56e9c2bd31418439090e869a >>> Author: Maxim Cournoyer <maxim.courno...@gmail.com> >>> AuthorDate: Fri Dec 9 08:16:07 2022 -0500 >>> >>> Revert "gnu: make-linux-libre*: Remove input labels." >>> >>> This reverts commit dfc6957a5af7d179d4618eb19d4f555c519bc6f2. >>> git-bisect >>> found it broke guix pull on non-x86_64 systems like powerpc64le, for >>> reasons >>> to investigate. >> >> In case you've not seen, I noticed this as well and I /think/ worked out >> what went wrong on https://issues.guix.gnu.org/59913. >> >> Hopefully the report is helpful and you didn't spend too much time on it >> if you've not seen it! > > Thanks for finding a solution! I was quite puzzled by the failure and > didn't have the time to investigate. We could rebase it on master with > a patch reverting the revert, and post it here to see what QA thinks > about it.
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? 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)))) (define %default-extra-linux-options `(;; Make the kernel config available at /proc/config.gz WDYT?
signature.asc
Description: PGP signature