From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 UGDuJBi1k2NlEAEAbAwnHQ (envelope-from ) for ; Fri, 09 Dec 2022 23:22:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WJTzJBi1k2MCOAAA9RJhRA (envelope-from ) for ; Fri, 09 Dec 2022 23:22:16 +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 3A8043E66B for ; Fri, 9 Dec 2022 23:22:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3lkp-0002up-Ti; Fri, 09 Dec 2022 17:22:03 -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 1p3lkp-0002ub-1Y for bug-guix@gnu.org; Fri, 09 Dec 2022 17:22: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 1p3lko-00031G-MW for bug-guix@gnu.org; Fri, 09 Dec 2022 17:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3lko-0006gJ-5G for bug-guix@gnu.org; Fri, 09 Dec 2022 17:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#59913: branch master updated: Revert "gnu: make-linux-libre*: Remove input labels." Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 09 Dec 2022 22:22:02 +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: Maxim Cournoyer Cc: Pierre Langlois , 59913@debbugs.gnu.org Received: via spool by 59913-submit@debbugs.gnu.org id=B59913.167062448525660 (code B ref 59913); Fri, 09 Dec 2022 22:22:02 +0000 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 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== 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-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=1670624536; 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: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=N+1ShyNawItgHIt7H/EdwKQqeG1B+uPt9n/pg9qW7Wk=; b=XVps3JSLYbbMVpdTdKW5ihdpuJN4/LrkVzW0CXZzbI6RzR3tgsRwSbmxoP/sUrApzj7dES q+zI+lI6juWo9FzzRF7ZaBb1hedsXK48SF5aFy1mbfRj4/3zvVW6jh3BgCueJDawC7lvsx kWP84sBTb19OhgzIYshsqdr2fxILefU0WmirVPNNO45WRBO9+58QpL+jq4aB00LoSXMz3I dWiNC1g+F9FUJYQ5+4JI37reYd9ZABHi3fmPjubPLYjlYSU8GomIgg7Uj0s5xBsnRO0Nn2 fY6t+lAQ0SX+oQDLqdccEhuPjom+Gc8UhjSlw/axI1cb14c8eNAGR4VtWvBn5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmx.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670624536; a=rsa-sha256; cv=none; b=iOprW9MRKXMlT0a2sQhJwsJl3pSTnZKgCd8lJEih5sWoJs90wEXpz988p+VGl2YOU7sDPg Byds8WRReZY6djQOkxf28Op2axt0EteGvwZ9139e3NjFvKPwI4TAJ5AJ4Nz/gsNx9q0IuY NHQATmq3OlP+Nbk7A1Fbs4URS7qHT3lrNI+cJ6suoHcSbpj4o2C3oUo1kcP/UJlShzm6CC uIoLuKBVBnSnu/IGlkIhu73RkG47Y98CXPxUDB0hBss2Xnpn6vsG5O1AnxUl/rSmhdFime /mYLuODWnT6vkmd8ORsVqI0ZNEBF75tRsIWVZJTKD65ot4Kpfk96Q8tOVD+K8Q== X-Migadu-Spam-Score: 0.05 X-Spam-Score: 0.05 X-Migadu-Queue-Id: 3A8043E66B X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmx.com (policy=none) X-TUID: REBJc0qgYTsA --=-=-= 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----- --=-=-=--