From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4OEBKHCzLGNz6gAAbAwnHQ (envelope-from ) for ; Thu, 22 Sep 2022 21:11:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gIz9J3CzLGNv+AAAauVa8A (envelope-from ) for ; Thu, 22 Sep 2022 21:11:44 +0200 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 3D370B023 for ; Thu, 22 Sep 2022 21:11:44 +0200 (CEST) Received: from localhost ([::1]:33544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obRbq-0000qs-L3 for larch@yhetil.org; Thu, 22 Sep 2022 15:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obPQi-0001LG-Fp for bug-guix@gnu.org; Thu, 22 Sep 2022 12:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obPQg-00083n-O3 for bug-guix@gnu.org; Thu, 22 Sep 2022 12:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obPQg-0003fT-Iz for bug-guix@gnu.org; Thu, 22 Sep 2022 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58008: [PATCH] gnu: linux: Fix the extra-version parameter in make-linux-libre*. Resent-From: Stefan Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 22 Sep 2022 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58008 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 58008@debbugs.gnu.org, leo@famulari.name X-Debbugs-Original-To: bug-guix@gnu.org, Leo Famulari Received: via spool by submit@debbugs.gnu.org id=B.166386547314039 (code B ref -1); Thu, 22 Sep 2022 16:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Sep 2022 16:51:13 +0000 Received: from localhost ([127.0.0.1]:38394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obPPs-0003eM-Lu for submit@debbugs.gnu.org; Thu, 22 Sep 2022 12:51:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:35434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obPPr-0003eE-DY for submit@debbugs.gnu.org; Thu, 22 Sep 2022 12:51:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obPPq-0000up-Mf for bug-guix@gnu.org; Thu, 22 Sep 2022 12:51:11 -0400 Received: from mr5.vodafonemail.de ([145.253.228.165]:49440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obPPj-0007z6-E4 for bug-guix@gnu.org; Thu, 22 Sep 2022 12:51:10 -0400 Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr5.vodafonemail.de (Postfix) with ESMTPS id 4MYLrg5f4Zz1y24; Thu, 22 Sep 2022 16:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-21dec; t=1663865459; bh=pVcKIm3c/2w+oHc9jpNSWqPA8PL88lgkz83d+0jZJ8w=; h=From:Content-Type:Subject:Message-Id:Date:To:X-Mailer:From; b=VaOoK0/xytVL1f5EyRf+JmPtxA9Mz0ejfMQWa3mJzBY1NOFjI3MmQuOpW+CJX+uks HcfKnQrcHfRDDm4E2g5StVtiOh9sVisnsIMDgtOQc71S3BrGArdgL/cLLD9AIShmGh xRyUqHW7Pq7rvpL8t9r96JH430T7eSUhbeTQq2x4= Received: from macbook-pro.kuh-wiese.my-router.de (aftr-62-216-207-171.dynamic.mnet-online.de [62.216.207.171]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4MYLrc28Ztz9rxT; Thu, 22 Sep 2022 16:50:53 +0000 (UTC) Content-Type: multipart/mixed; boundary="Apple-Mail=_6BDF00B9-B7C5-437E-9679-99FE3EFB1747" Message-Id: Date: Thu, 22 Sep 2022 18:50:52 +0200 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-Mailer: Apple Mail (2.3124) X-purgate-type: clean X-purgate: clean X-purgate-size: 6558 X-purgate-ID: 155817::1663865459-AB7FD4F8-EC511606/0/0 Received-SPF: pass client-ip=145.253.228.165; envelope-from=stefan-guix@vodafonemail.de; helo=mr5.vodafonemail.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: Stefan From: Stefan via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663873904; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=pVcKIm3c/2w+oHc9jpNSWqPA8PL88lgkz83d+0jZJ8w=; b=e7wfwezHpnbs24unHD2ahVZI7dutaI63xgb3fFOBIQ/U+RiPwu62/qUoo7DF/WRsn4dAC9 Imy2GCjXTMcO/Y3lZDd2nINPpqXUC+ThoaHhyYOgFG5KRjhGHBctnEj9rKQRKRFvBgvyCp KPsqgxeC87M0fX7Z2lOzrC+CHxC/JlHQcLUxPbQEE2FQalNyoNCIzp23dCp9Bcdp/1hK+V kCp8GLNTZIGGyo7FM95fVHd7UUONpzu0+bFy2wVDdUFL7W/meMySd02QfzM3h19o3sIxek +Sczy7dqwOeFQDybPxoXSC2Ym+KRHIBoFyBHfMIXOsz8MSAIsn4Z69/97tGOIA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663873904; a=rsa-sha256; cv=none; b=bdut750wixSircTYqcIm3cxWcfb8bdHtx1iKipZJccBjGe44fughRNrEMY7SVeoTx0QOAz t9Pl5A9Ut6KW1xYm16k7mUBjTssnW8FmiX7obf1su4ujDvVJx6xbEUsPNp5bHZEZYHZ7os j1WAdWsaxrt00bPatBkmobD/uYe76C+C2LKHpHP5jKvxHmtO8i/YfeTwcdIUMByTCcnmBH mk5PVSH9KtnWcswByuf6eVaYcKD7bMmCN4wrRxilFwCm1ZyCG/93JVN8MvLUe73iKc8nNF iGJKE3sKV0X42ok6ATKDmMP5QxCHQjoBew4e/A/x2LYB+Ay/yYztwqsjPUVzZg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=vodafonemail.de header.s=vfde-mb-mr2-21dec header.b="VaOoK0/x"; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -4.35 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=vodafonemail.de header.s=vfde-mb-mr2-21dec header.b="VaOoK0/x"; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 3D370B023 X-Spam-Score: -4.35 X-Migadu-Scanner: scn0.migadu.com X-TUID: Q5oE1iB7cycJ --Apple-Mail=_6BDF00B9-B7C5-437E-9679-99FE3EFB1747 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi Leo! I=E2=80=99m addressing you directly because of the entry in = etc/teams.scm. I found and fixed a bug in make-linux-libre*. The split of the phase = 'configure into a separate 'set-environment will be used by another = patch.=20 Actually this is part of a patch series in 48314. But it is an = independent fix, which can reduce the size of that other ticket. If this patch is accepted, I may send another part of that patch series = separately. Bye Stefan --Apple-Mail=_6BDF00B9-B7C5-437E-9679-99FE3EFB1747 Content-Disposition: attachment; filename=01-gnu-linux-fix-extra-version.patch Content-Type: application/octet-stream; name="01-gnu-linux-fix-extra-version.patch" Content-Transfer-Encoding: quoted-printable gnu:=20linux:=20Fix=20the=20extra-version=20parameter=20in=20= make-linux-libre*.=0A=0AFrom:=20Stefan=20=0A= =0A*=20gnu/packages/linux.scm=20(make-linux-libre*)=20= ['set-environment]:=20Make=0Athe=20Makefile=20accept=20EXTRAVERSION=20= from=20the=20environment.=20Fix=20the=20usage=20of=0Aan=20empty=20= extra-version=20string.=20Split=20this=20new=20phase=20out=20of=20and=20= adding=0Aif=20before=20=E2=80=A6=0A['configure]:=20=E2=80=A6=20to=20make=20= the=20phases=20more=20hackable.=0A---=0A=20gnu/packages/linux.scm=20|=20=20= =2018=20+++++++++++-------=0A=201=20file=20changed,=2011=20= insertions(+),=207=20deletions(-)=0A=0Adiff=20--git=20= a/gnu/packages/linux.scm=20b/gnu/packages/linux.scm=0Aindex=20= 306c18e398..1a35e857c3=20100644=0A---=20a/gnu/packages/linux.scm=0A+++=20= b/gnu/packages/linux.scm=0A@@=20-64,6=20+64,7=20@@=0A=20;;;=20Copyright=20= =C2=A9=202022=20Artyom=20V.=20Poptsov=20=0A=20= ;;;=20Copyright=20=C2=A9=202022=20Rene=20Saavedra=20= =0A=20;;;=20Copyright=20=C2=A9=202022=20muradm=20= =0A+;;;=20Copyright=20=C2=A9=202022=20Stefan=20= =0A=20=0A=20;;;=0A=20;;;=20This=20file=20is=20= part=20of=20GNU=20Guix.=0A@@=20-824,8=20+825,8=20@@=20for=20ARCH=20and=20= optionally=20VARIANT,=20or=20#f=20if=20there=20is=20no=20such=20= configuration."=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (lambda=20_=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (substitute*=20(find-files=20"."=20"^Makefile(\\.include)?$")=0A=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(("/bin/pwd")=20= "pwd"))))=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(replace=20= 'configure=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (lambda*=20(#:key=20inputs=20target=20#:allow-other-keys)=0A+=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20(add-before=20'configure=20= 'set-environment=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (lambda*=20(#:key=20target=20#:allow-other-keys)=0A=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20;;=20Avoid=20introducing=20= timestamps.=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (setenv=20"KCONFIG_NOTIMESTAMP"=20"1")=0A=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20(setenv=20"KBUILD_BUILD_TIMESTAMP"=0A@@=20= -847,13=20+848,16=20@@=20for=20ARCH=20and=20optionally=20VARIANT,=20or=20= #f=20if=20there=20is=20no=20such=20configuration."=0A=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(setenv=20= "CROSS_COMPILE"=20(string-append=20target=20"-"))=0A=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(format=20#t=20= "`CROSS_COMPILE'=20set=20to=20`~a'~%"=0A=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(getenv=20= "CROSS_COMPILE"))))=0A-=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20;;=20Allow=20EXTRAVERSION=20to=20be=20set=20via=20the=20= environment.=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (substitute*=20"Makefile"=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20(("^=20*EXTRAVERSION[[:blank:]]*=3D")=20"EXTRAVERSION=20= ?=3D"))=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (setenv=20"EXTRAVERSION"=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20#$(and=20extra-version=0A-=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20(string-append=20"-"=20extra-version)))=0A-=0A+=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20(not=20(string-null?=20extra-version))=0A+=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20(string-append=20"-"=20extra-version)))))=0A+=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20(replace=20'configure=0A+=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20(lambda*=20(#:key=20inputs=20= #:allow-other-keys)=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20(let=20((config=20(assoc-ref=20inputs=20"kconfig")))=0A-=0A=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20Use=20a=20= custom=20kernel=20configuration=20file=20or=20a=20default=0A=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20configuration=20= file.=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (if=20config=0A@@=20-871,7=20+875,7=20@@=20for=20ARCH=20and=20optionally=20= VARIANT,=20or=20#f=20if=20there=20is=20no=20such=20configuration."=0A=20=0A= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (invoke=20"make"=20"oldconfig"))))=0A=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20(replace=20'install=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20(lambda*=20(#:key=20inputs=20native-inputs=20= #:allow-other-keys)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= (lambda*=20(#:key=20inputs=20#:allow-other-keys)=0A=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20(let=20((moddir=20(string-append=20= #$output=20"/lib/modules"))=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20(dtbdir=20(string-append=20#$output=20= "/lib/dtbs")))=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20;;=20Install=20kernel=20image,=20kernel=20configuration=20and=20= link=20map.=0A= --Apple-Mail=_6BDF00B9-B7C5-437E-9679-99FE3EFB1747--