From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 09 17:21:25 2022 Received: (at 59913) by debbugs.gnu.org; 9 Dec 2022 22:21:25 +0000 Received: from localhost ([127.0.0.1]:38876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3lkD-0006fo-0N for submit@debbugs.gnu.org; Fri, 09 Dec 2022 17:21:25 -0500 Received: from mout.gmx.net ([212.227.17.22]:57445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3lkB-0006fg-8c for 59913@debbugs.gnu.org; Fri, 09 Dec 2022 17:21:23 -0500 Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MbRfl-1oWMrd1FYP-00bw2t; Fri, 09 Dec 2022 23:21:16 +0100 References: <167059225344.15591.17976801315617510996@vcs2.savannah.gnu.org> <87k030wfhu.fsf@gmx.com> <87ilik5oks.fsf@gmail.com> User-agent: mu4e 1.8.11; emacs 28.2 From: Pierre Langlois To: Maxim Cournoyer Subject: Re: branch master updated: Revert "gnu: make-linux-libre*: Remove input labels." Date: Fri, 09 Dec 2022 21:33:29 +0000 In-reply-to: <87ilik5oks.fsf@gmail.com> Message-ID: <87sfhouskl.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:qMpQeBf7CBuCj+IM5C/xkYZmAecI0ob+dA7bHNaDGNvqqB7vWgN lUL9Hec/pt9okMUkstP42mQsl5zxqXJsG2fbNn3AoIDfSQhWSC53HGXOnBJ7eREG2xBx8x2 Ly7eo8CtDxGUqpbtC9JGlu3PMEU5cFQ+NeIUShtcFHlk5yoxnJ63JRAWE/vCA2SZ/OFJxVB f5qBOxcDZ3SfMIJY3sFOA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:9rSbE3Of/Yk=;XUo+6+QYRgK/fc+vBTduhwzLQCU E7vUVJOi3ImbYd+u2nDbm8lU48tAxpclws7/FdF5Q0O+96RN4N9Na/RonzdqKboUrXdg5uqhF rpTG69bfrWawM88Sy+2Zfn+/eZJoGGYqNKNnjZvDFCkA0WOc23I3njg6q56igkvRnT0xWZn+Z vCFUlwEGFARe+VWvWkxiSU3RAHCjoYjg4qGtcy0hRvlmWxSQvWp5TKegCa0D0f8xuaA5Y4D6w T4tm4SsSQ6oUucyGeiHrOPqAxr2nlwUow29NKrp1e4HQmV35H+icdksdnomkE/+qTJ0XTgPnp dwlTQLgxhgzeHWrJJLeOBbjWMFrlhkS0DlTPPjZf3vKrYUT8bwsd015KJ7vRCk6F1W4wcIeBG GRluFt6Ccx9j+t0CNDYZ17bCb4V36jyX+UCXTou0XMnEvlxWL5POmVksdaZZv7cXWlwBzV9Rv BHMHwudiZuzQ+tObXiSHxCn4+vENmQysuvMextedQmMScgZFutFN3SSNQHkSyqZ6DxlsGbQyT aUowC3U5Jqr+ffKQE+vxP5Cj3EQacpVtqhVVO6XClLK85N4bDCDDteqaC4Wf8j0HPXts/AlMn BjuJIgq1sQ6/5+FY2WRyf9MnDbeU1oIJTykYY6y8rHyxfAuSt+O0/VRW8kjOUkBaJ5M8SRBpz /Vg6iYTxDno2qU1+b/6XLegmCMoK0I8LTF/JKc4oTy0yJJS6xiBR/3iO0qntGj0GNY4Boleo6 yHKaJ0skTeEW841q0W3zbvxdBn7q5wIlS+1C8j6ZmVY1vXg8jLuo6LAb0RiahRTAfcbgToKO7 ULQWdIXgc3YX2UixDg1G7/pImKqrfEOkkMgOAdDj8/AMZMCVokjncLRFHOBUEMGiL4yLUyAA+ +OeCSLwGLKWP9xi9Xz42W/iMQHl9vhgMBN//pTCXdbuSbrA5yHEWJyN+0jLuhvVaK5kIyAQJ9 LGyAf0jEBKwjTvFVPTqWqrOwilw= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59913 Cc: Pierre Langlois , 59913@debbugs.gnu.org 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.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Maxim Cournoyer writes: > Hi Pierre, > > Pierre Langlois writes: > >> Hi Maxim, >> >> guix-commits@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 >>> AuthorDate: Fri Dec 9 08:16:07 2022 -0500 >>> >>> Revert "gnu: make-linux-libre*: Remove input labels." >>>=20=20=20=20=20 >>> This reverts commit dfc6957a5af7d179d4618eb19d4f555c519bc6f2. git-= bisect >>> found it broke guix pull on non-x86_64 systems like powerpc64le, fo= r 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 =2D-- 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")) =2D (file (string-append "linux-libre/" name))) =2D (local-file (search-auxiliary-file file)))) + (file (string-append "linux-libre/" name)) + (config (search-auxiliary-file file))) + (and config + (local-file config)))) =20 (define %default-extra-linux-options `(;; Make the kernel config available at /proc/config.gz WDYT? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmOTtNoYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UT8EH/jUPtpgBIWnE8Ci9K6loDA1f PRtKIaaXSHxpnB54hBHUMyPel7lmAedP6i4Jlbt6p7evm4BAbu9CG6CSeqcyLepF Ny79J6HHLvRFrYn9DXcomi9TqXBMRsWPg+P3eWJwuPY5R0XaudQ6NjBKKPF4aL7f SkS8DYzjUMsaSV6fdfLfGSxTTzz5CPDvsF/IwpGd0Tc4a3yzHKyi6UXhdkhNHJjj 0lOzf/QmO05XbI+4OhMAoKj9H8stwdNqHOm9uk8OjoOGEGC45yMy13SH+XUKdhVp 8SbmAlhh9DYYe7rksceOhXdJTMTyJ+B3nC1Ttk6RmjF4LluBgKdTUHD1D2SjPqY= =9Jz5 -----END PGP SIGNATURE----- --=-=-=--