From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43173@debbugs.gnu.org Cc: Mark H Weaver , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159907137223399 (code B ref -1); Wed, 02 Sep 2020 18:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 18:29:32 +0000 Received: from localhost ([127.0.0.1]:60691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXVk-00065L-A5 for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:29:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:34930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXVi-00065D-Dl for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:29:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXVi-0007Ok-7J for guix-patches@gnu.org; Wed, 02 Sep 2020 14:29:30 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:57461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXVg-0002zE-AV for guix-patches@gnu.org; Wed, 02 Sep 2020 14:29:29 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 57727F8D; Wed, 2 Sep 2020 14:29:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 14:29:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=mesmtp; bh=M2jjTV5/f4irCY5TEfeHEC+1DdLNlDWVXk81rhYl+i4=; b=Xl hE1Hw18E3rYgfZ+2NffbrO993cCZmtIen5BFByuGhKJKE5Zd1LASEx70CuSuVZSs DtP6aZ8X5VCIB2MJAAtaiBNiRInbKijBJdKu7O2kmdH/riofqKhA9COoUnN9yJb1 8RQ/GASeNG1Yk4hwyxA/a49zWgXx2z5uCcu/uh1Aw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=M2jjTV5/f4irCY5TEfeHEC+1DdLNl DWVXk81rhYl+i4=; b=YTFzjtqWJQbU619o60uL34eV3yS6mKpmDNBKPxzZjCV6A A5JCaqn6RTARtFuhisaKVdAQkce6Lb6VMJQgX3WtpwXwvqpuFj92JfhiRwCpbIsA s8Q96fbZ6twty1jZ5biOB5+UkBKe27JRHZoYHnDQj+V7VKgtmImCtyyCsHSkceLu eNvZEa6TpSevwiUPPwWnzspalVxPn92fLPSzNH1KHArHCs8JyOiNRhWoMp74Fy0G kcNTyVZWAu9EZypFW8JRUFH2Sv0VUegtEH9Re6E1ZNdEGlJxOmAjKop83a2PrLrr d0x4LxLU9B5hXvGQyUMy62mFPjFn/aJhoeuiuTu2A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudefledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkgggtugesghdtreertddtjeenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepudeludeujefggefhteekudekveevueffleefleffgeegteevgeekveehffejteeh necuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeejfedrudeguddruddvjedrudegie enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvgho sehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 54A00306005E; Wed, 2 Sep 2020 14:29:24 -0400 (EDT) Date: Wed, 2 Sep 2020 14:29:22 -0400 From: Leo Famulari Message-ID: <20200902182922.GA26301@jasmine.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RnlQjJ0d97Da+TV1" Content-Disposition: inline Received-SPF: pass client-ip=64.147.123.25; envelope-from=leo@famulari.name; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 14:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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: -2.4 (--) --RnlQjJ0d97Da+TV1 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In recent discussions [0], people raised the possibility that we might accidentally leave non-free firmware blobs in our linux-libre packages. If I understand correctly, the root of the issue is that, currently, we manually specify the versions of the deblobbing scripts. They are not changed with every linux-libre release, so it is usually okay to use an older version number =E2=80=94 the scripts themselves will be identical. However, sometimes the scripts do change, and we might not notice, and thus we would fail to remove every blob from the kernel sources. These two patches should make that failure mode impossible, by 1) making sure that the file names of the deblobbing scripts' store items include the full version number of the kernel and 2) only defining the version in one place. The hashes of the deblob scripts will be checked automatically when Guix downloads them for each new kernel release. I had to move the linux-libre-nnn-version variables to an earlier part of the file, so that they are defined when referenced in the deblob-scripts-nnn procedures. I regret changing the way this code is organized... your advice is welcome! [0] https://lists.gnu.org/archive/html/guix-devel/2020-08/msg00040.html --RnlQjJ0d97Da+TV1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl9P5H4ACgkQJkb6MLrK fwgpEA/9GyAQspYSOkYvlPIJT9vidZpcB8RJX/0anf5gLRy/i00FXlA5t8Kx9Ewz 5JSmTjkXftfQfXsOL7ip//XkEHqUBMPU2uhNTUg4SEWmiwoiaWVgwAXXqOoqU2xr Qs5VLL8BNM+So4M926X0+lBld0+e+54RW8bDz6pcofBbzcLb7GZRfeUnj9nJaBPv Bgek3wGERkMivv9stkU55dKLhU55OuFB9O8GNQaZX1EpzOf61uzmNMErmVU4odsX 03IixwDy68hKVBehVg8AqI+eEv/pRu7VnOQ0E3Qum1Wb3wnnZ5dHrBUhz3pvMraZ Ni0NG6OjFK3UUTFMcfBo908BhIzEg+Tan8V2IoknE5VYaXV07ZDPXzRdg9hV3Zlt bFHjxyjKT3HgQIKj56y4XvPg7mIfurrY7kgS8lBD5FgdOt1DE7eVCOHliHRwqP3c 8mVeu1nNHyYf8BLE2JViwmTdbagJY49FJ8Ak1zIb2elEKYsGrExkxcfkWZ3mnGF5 WloquobBnbfLxQcdwmGV7VTHiYniHkW37iR/idb5wx9gupR+xP224caS3GuU8y2X ZdyqZ+FjP1P0mFb1hQd8SPMox1bC8rLCuQw7eZkKv/Gn9sVP4XI+vQ3DJC6tcurm mizpNXGDwONxNBkyKi3HQEWpITSan1XW7jlgDSBfmoFsr0xNiyk= =0LIu -----END PGP SIGNATURE----- --RnlQjJ0d97Da+TV1-- From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] [PATCH 1/2] gnu: Do not truncate the version of the linux-libre deblobbing script file names. References: <20200902182922.GA26301@jasmine.lan> In-Reply-To: <20200902182922.GA26301@jasmine.lan> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43173@debbugs.gnu.org Received: via spool by 43173-submit@debbugs.gnu.org id=B43173.159907146223653 (code B ref 43173); Wed, 02 Sep 2020 18:32:02 +0000 Received: (at 43173) by debbugs.gnu.org; 2 Sep 2020 18:31:02 +0000 Received: from localhost ([127.0.0.1]:60700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXB-00069M-Pk for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:02 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:59481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXA-000694-4C for 43173@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:00 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 501D1F93; Wed, 2 Sep 2020 14:30:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 14:30:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=g2yUSORCOLnabzbPB72O0M7 2XWsed5T/pCYDG6RRq/A=; b=XOJvAA6bi1fsokChinunPzvjhBCj6s06VCBiAjr pmAnlmjH6F8/Z9Wc3s74KZ5lyptKbXor59LEFYlLAgrT1/Ee0d/bumnJ1ajCuJle v3ewpNuRJI/xldKJtr7RnolfroUGoAFay+DyW4U6V+qP0cwmdEBbYHlZtrfXbN6Q DePw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=g2yUSORCOLnabzbPB 72O0M72XWsed5T/pCYDG6RRq/A=; b=dYcroVJA7mrkoSDhEDZnsgvXtEgIqsveS Oe+kkDpYts1kg1UfbfFdbC9AVSzaCFyluUNuAKT24z6bde2Kf77dnfh0FSkua03d G3I4pXeyM9njsNW/pk0GmhUEyIY0cMYYEgojKGPEVg97kBt8xNgl5TgQ4Cz0RfhO K9d+BExNnbNeXE4LoNXSn+pA/U2GY5HBOuONS6a4N3m1him3ofIdX2cqUMca7Csi a697uRr96t+gaRvtPVMVXTnNyB9FTozsPoCIR94b70HczFjgYVNKBnlcLYYpuU9v +FSULpJVg9MsPoTfScaY+5K/cLUDMf48oG5PCyUqDvnUluaRquAgA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudefledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeegkeevvdefteekleegjeejjeejhfeiff euieeltedvgeeghefhkeekvefhuddugfenucffohhmrghinhepfhhsfhhlrgdrohhrghen ucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from jasmine.lan (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 888AF306005E for <43173@debbugs.gnu.org>; Wed, 2 Sep 2020 14:30:53 -0400 (EDT) From: Leo Famulari Date: Wed, 2 Sep 2020 14:30:36 -0400 Message-Id: <4d36157b10b143ce60e145e49dbf59df2dcd415c.1599071437.git.leo@famulari.name> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/linux.scm (linux-libre-deblob-scripts): Use VERSION instead of VERSION-MAJOR+MINOR. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b742688f79..8b66ed2b60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -193,7 +193,7 @@ defconfig. Return the appropriate make target if applicable, otherwise return (method url-fetch) (uri (string-append "https://linux-libre.fsfla.org" "/pub/linux-libre/releases/" version "-gnu/" - "deblob-" (version-major+minor version))) + "deblob-" version)) (file-name (string-append "linux-libre-deblob-" (version-major+minor version))) (sha256 deblob-hash)) @@ -202,8 +202,7 @@ defconfig. Return the appropriate make target if applicable, otherwise return (uri (string-append "https://linux-libre.fsfla.org" "/pub/linux-libre/releases/" version "-gnu/" "deblob-check")) - (file-name (string-append "linux-libre-deblob-check-" - (version-major+minor version))) + (file-name (string-append "linux-libre-deblob-check-" version)) (sha256 deblob-check-hash)))) (define deblob-scripts-5.8 -- 2.28.0 From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] [PATCH 2/2] gnu: linux-libre: Enforce the use of the correct deblobbing scripts. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43173@debbugs.gnu.org Received: via spool by 43173-submit@debbugs.gnu.org id=B43173.159907146223673 (code B ref 43173); Wed, 02 Sep 2020 18:32:02 +0000 Received: (at 43173) by debbugs.gnu.org; 2 Sep 2020 18:31:02 +0000 Received: from localhost ([127.0.0.1]:60702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXC-00069S-2H for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:02 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:40037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXA-000693-4B for 43173@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:01 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 60693F98; Wed, 2 Sep 2020 14:30:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 14:30:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=5ppEzNz0E3 7cTqns7/9WPWuiIFWwpogHMbXgl5gOGNE=; b=dYG04FKiEX0bNDRCvMsUYRV2D+ B6z8jJuuc0l51xqKUeR1Og6/BCdv6ObKA75yG5+E101sX8aaZwe+KRw+Rrvf9RPt tTSlS5o2eONa+d9MjyiofAhotrrGgLT+WrDkeKUNUCH9k2jpqfDly162oKlKa9Uu PWciEeVUmxV7wOrfc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=5ppEzNz0E37cTqns7/9WPWuiIFWwpogHMbXgl5gOGNE=; b=JU+LmW87 rxXGnFpUyGAOuOwPZG8SMteB1IfivFpVDbFHJg2sYaDOv86amzCoIgwvtWTmb/s9 3iyRnKfNHvBz58+JcAvc6cikWdjDtgeHHBOlIcZCnNFjwApTfokKlpmyKi9tVFQ7 IdrI+ucMCIvxcWQowFZBTGfUu8AVk3nxeCuY3derX0hbkmnw2fmVDsN7CuOKnN7y +Um9LJC2/TB9XRfCXxJ2TEyzHKfc1VIpTocYiZ4dRsCGyLGZlFaxFVSqFPGt5QOU Ujzo/MuNje6ZVaqx9vXrjY5q2MKRwaZ7MVQf3Hd1Nr+cxIHflT7+V3bmJW9PZrjf REIQSWKrgzqjQg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudefledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpefhgeegteeitddvudduveeuhedvhe fhfeehgfehvdfhudegueekhedvhfffhffhgeenucfkphepjeefrddugedurdduvdejrddu geeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from jasmine.lan (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id A3EE130600B7 for <43173@debbugs.gnu.org>; Wed, 2 Sep 2020 14:30:53 -0400 (EDT) From: Leo Famulari Date: Wed, 2 Sep 2020 14:30:37 -0400 Message-Id: <031e277663617ab8dfe00d339a5acd1a379a63ee.1599071437.git.leo@famulari.name> X-Mailer: git-send-email 2.28.0 In-Reply-To: <4d36157b10b143ce60e145e49dbf59df2dcd415c.1599071437.git.leo@famulari.name> References: <4d36157b10b143ce60e145e49dbf59df2dcd415c.1599071437.git.leo@famulari.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/linux.scm (deblob-scripts-5.8, deblob-scripts-5.4, deblob-scripts-4.19, deblob-scripts-4.14, deblob-scripts-4.9, deblob-scripts-4.4): Use the respective LINUX-LIBRE-N-VERSION variables. --- gnu/packages/linux.scm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b66ed2b60..727f3e07cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -180,6 +180,21 @@ defconfig. Return the appropriate make target if applicable, otherwise return ((string-prefix? "powerpc64le-" system) "ppc64_defconfig") (else "defconfig"))) + +;;; +;;; Kernel versions. +;;; + +;; The current "stable" kernel +(define-public linux-libre-5.8-version "5.8.5") + +;; The "longterm" kernels with long-term upstream support +(define-public linux-libre-5.4-version "5.4.61") +(define-public linux-libre-4.19-version "4.19.142") +(define-public linux-libre-4.14-version "4.14.195") +(define-public linux-libre-4.9-version "4.9.234") +(define-public linux-libre-4.4-version "4.4.234") + ;;; ;;; Kernel source code deblobbing. @@ -207,37 +222,37 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.8 (linux-libre-deblob-scripts - "5.8.4" + linux-libre-5.8-version (base32 "07z7sglyrfh0706icqqf3shadf638pvyid9386r661ds5lbsa2mw") (base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7"))) (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.61" + linux-libre-5.4-version (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") (base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.142" + linux-libre-4.19-version (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.195" + linux-libre-4.14-version (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.234" + linux-libre-4.9-version (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.234" + linux-libre-4.4-version (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) @@ -382,7 +397,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.8-version "5.8.5") (define-public linux-libre-5.8-pristine-source (let ((version linux-libre-5.8-version) (hash (base32 "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"))) @@ -390,7 +404,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.8))) -(define-public linux-libre-5.4-version "5.4.61") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) (hash (base32 "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"))) @@ -398,7 +411,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.142") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) (hash (base32 "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9"))) @@ -406,7 +418,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.195") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) (hash (base32 "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr"))) @@ -414,7 +425,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.234") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) (hash (base32 "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm"))) @@ -422,7 +432,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.234") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) (hash (base32 "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539"))) -- 2.28.0 From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 21:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: leo@famulari.name, 43173@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: Leo Famulari , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159908095213891 (code B ref -1); Wed, 02 Sep 2020 21:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 21:09:12 +0000 Received: from localhost ([127.0.0.1]:60877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDa0F-0003bz-PG for submit@debbugs.gnu.org; Wed, 02 Sep 2020 17:09:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:58720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDa0D-0003br-RE for submit@debbugs.gnu.org; Wed, 02 Sep 2020 17:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDa0D-0007Qw-N1 for guix-patches@gnu.org; Wed, 02 Sep 2020 17:09:09 -0400 Received: from world.peace.net ([64.112.178.59]:39134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDa0B-0005l5-Ia for guix-patches@gnu.org; Wed, 02 Sep 2020 17:09:09 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDa09-0005eB-7t; Wed, 02 Sep 2020 17:09:05 -0400 From: Mark H Weaver In-Reply-To: <20200902182922.GA26301@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> Date: Wed, 02 Sep 2020 17:07:56 -0400 Message-ID: <87363z28fs.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=64.112.178.59; envelope-from=mhw@netris.org; helo=world.peace.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:09:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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: -2.3 (--) Leo Famulari writes: > In recent discussions [0], people raised the possibility that we might > accidentally leave non-free firmware blobs in our linux-libre packages. > > If I understand correctly, the root of the issue is that, currently, we > manually specify the versions of the deblobbing scripts. They are not > changed with every linux-libre release, so it is usually okay to use an > older version number =E2=80=94 the scripts themselves will be identical. > However, sometimes the scripts do change, and we might not notice, and > thus we would fail to remove every blob from the kernel sources. > > These two patches should make that failure mode impossible, by 1) making > sure that the file names of the deblobbing scripts' store items include > the full version number of the kernel and 2) only defining the version > in one place. The hashes of the deblob scripts will be checked > automatically when Guix downloads them for each new kernel release. [...] > [0] https://lists.gnu.org/archive/html/guix-devel/2020-08/msg00040.html In the aforementioned discussion, I agreed to either: (1) Wait until the linux-libre project publishes a new release, or (2) Check for new blobs myself in the upstream release. Since then, I've actually chosen option (2) a couple of times. I did so by reviewing each of the upstream commits looking for new blobs. I found that it took on the order of 10-15 minutes per release. With this proposed change, we will lose an easy way to exercise option (2), and will effectively be constrained to always wait until linux-libre produces a new release. I'll leave it to the maintainers to decide what to do here, but I wanted to make it clear what's at stake. Personally, I do not find Jason and Alexandre's arguments compelling, and would be in favor of retaining the option to push these security updates more quickly by checking for new blobs manually. Thanks, Mark From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Mark H Weaver Cc: maxim.cournoyer@gmail.com, 43173@debbugs.gnu.org X-Debbugs-Original-Cc: Maxim Cournoyer , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159908496428625 (code B ref -1); Wed, 02 Sep 2020 22:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 22:16:04 +0000 Received: from localhost ([127.0.0.1]:32782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDb2y-0007Rd-6X for submit@debbugs.gnu.org; Wed, 02 Sep 2020 18:16:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:38458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDb2v-0007Qu-32 for submit@debbugs.gnu.org; Wed, 02 Sep 2020 18:16:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDb2u-0004cW-Rp for guix-patches@gnu.org; Wed, 02 Sep 2020 18:16:00 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:57077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDb2t-0005JJ-0P for guix-patches@gnu.org; Wed, 02 Sep 2020 18:16:00 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 1CC00C12; Wed, 2 Sep 2020 18:15:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 18:15:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=Q3hEKObE3zQobEdxTcNyMxhZ w2QWb3Tn902ZG11e8d0=; b=ObOFsosQpUj0nsuM9jkM8Cqe/WWkJhT19IwqtbgV hEZnRCYeKNMPgedPGjHm+1BxS/fuizEtTkZ2RdqMB88Nju64Dsyr9YVaFqgGaoCx LJShEZDTKSDlEtvLM8/sRjaPfrXp9VNm4iEfFqWpJOA4WHBTQCRFXMc6X/AuO/3/ Jvs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Q3hEKO bE3zQobEdxTcNyMxhZw2QWb3Tn902ZG11e8d0=; b=hQfbSxsN9Gk/w9anNfMAZd GS5U2QZBfRukFffBh7wMDGWpzlpHlQNYscJGCm0K3JXVknwWFf4wG8QX1jF5WpAO NP9pfwf9jWVrcBjYi9NQaLkQcGAX8tAlg3S7eOXXvbQEOZnTR1WbGCkFg0xilpom 5/pISlqchZFXbPQwDdKVGBufMsKpnekFF9cxP4+JJ3xXIPOpYNoaxkdJgQBSL/Sz mNGh+x4UGiY6MIJqd0RyUSs5qUIL8sV7gZSa0kJyAdbJIZqAqOonRjYGTmuGgvjY HhK2O0LN0+l9XC+rV5xEyKgdK8HxUXhPIo3rFnCMHcN7qb52iK+p2bVksZvPebTQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudegtddgtdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpedukeevgeetkeeltefgiedtjefgjeekffduteehvdfhueekudelieekjeefheff teenucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 8E8CC306005F; Wed, 2 Sep 2020 18:15:55 -0400 (EDT) Date: Wed, 2 Sep 2020 18:15:52 -0400 From: Leo Famulari Message-ID: <20200902221552.GA32317@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <87363z28fs.fsf@netris.org> Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:49:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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: -2.4 (--) --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 02, 2020 at 05:07:56PM -0400, Mark H Weaver wrote: > In the aforementioned discussion, I agreed to either: >=20 > (1) Wait until the linux-libre project publishes a new release, or > (2) Check for new blobs myself in the upstream release. >=20 > Since then, I've actually chosen option (2) a couple of times. I did so > by reviewing each of the upstream commits looking for new blobs. > I found that it took on the order of 10-15 minutes per release. >=20 > With this proposed change, we will lose an easy way to exercise option > (2), and will effectively be constrained to always wait until > linux-libre produces a new release. We would still be able to use that method, by effectively reverting this patch, as desired. The intended effect of this patch is that it will not be possible to accidentally use the incorrect deblob scripts. I think we should try to make it harder to make mistakes, but not forget that we can remove the guardrails when we want to. --6TrnltStXW4iwmi0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl9QGZEACgkQJkb6MLrK fwj5iA//cGDgAhLbZIE2X93aPM/Uv96neQqTWACDXumKFlSSoJApLdQC9x3JWvrN 4NaaI394q62Dq4AeNa5ogGJxeCRHpwOeRTb6Yu8L2UqMeUwDfLGtT+OTN3//4bg3 SXE9RmNp3nMezlf7Hu5wyeBEgL4ig3Hm8klm9wltyhxnygRm4JZmChkLGhUQJYJW E1ZJhMJb+7dQBYU3tg/vojQ/VloqBqzr9xwWunFT2vICMnrsXfuPN4/CLMKRgQAz 8g8UnrJaVBDmtR3GTd+RR26aGQwOTHYN1W6ZqZ76vEpTPs421RI4vfGKXVzHrs40 oU4Bzun/ZzcJhq6QmVK4E3lgEvXx4vwXw6bZWTmG4P+8KkaxKfCr9vNjtL5BA5YE Z7T0h7DVBa4sNjqbtAbjsGK/ZoJQqfNyQLisBE3uUMq9GJbGVTjP35DM0sfsIZQs EATHqE/TCvmo8o2p+mX87aQ4KbeNNJ3p0KkWXHhINbhBX4d9+rYnq22bXajmrUzO rNrdlrG5ukXggQ4n3nDBJUiBoumCq/jYe7oP7n3A9bE8smF28VhIn6uATP35j8Qd aIhqBZDtfUnHdex7uCEdzALtIfGl5wEMRnY3jTZxfD4RPba8UGJnV2Gg4upyI5H1 uzyqjZWUudWpAsY4BK3Of9QKf4WG+Qa8jCA4VeG3/0/NfLpjI08= =R4W8 -----END PGP SIGNATURE----- --6TrnltStXW4iwmi0-- From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 23:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Famulari Cc: maxim.cournoyer@gmail.com, 43173@debbugs.gnu.org X-Debbugs-Original-Cc: Maxim Cournoyer , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159909086213359 (code B ref -1); Wed, 02 Sep 2020 23:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 23:54:22 +0000 Received: from localhost ([127.0.0.1]:32874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDca2-0003TK-Kv for submit@debbugs.gnu.org; Wed, 02 Sep 2020 19:54:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:51612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDca1-0003TD-1i for submit@debbugs.gnu.org; Wed, 02 Sep 2020 19:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDca0-0008Kf-PO for guix-patches@gnu.org; Wed, 02 Sep 2020 19:54:16 -0400 Received: from world.peace.net ([64.112.178.59]:39498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDcZx-0007ir-SC for guix-patches@gnu.org; Wed, 02 Sep 2020 19:54:16 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDcZv-0007fZ-Jc; Wed, 02 Sep 2020 19:54:11 -0400 From: Mark H Weaver In-Reply-To: <20200902221552.GA32317@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> <20200902221552.GA32317@jasmine.lan> Date: Wed, 02 Sep 2020 19:53:02 -0400 Message-ID: <87zh67zqfa.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=64.112.178.59; envelope-from=mhw@netris.org; helo=world.peace.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 19:54:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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: -2.3 (--) Hi Leo, Leo Famulari writes: > We would still be able to use that method, by effectively reverting this > patch, as desired. I suppose that's true. Fair enough :) > The intended effect of this patch is that it will not be possible to > accidentally use the incorrect deblob scripts. I agree that it would be good to prevent this. > I think we should try to make it harder to make mistakes, but not forget > that we can remove the guardrails when we want to. That makes sense. I withdraw my objection to the overall approach, but I have a suggestion regarding the file organization: Instead of having all 'linux-libre-*-version' definitions in one section, all 'deblob-scripts-*' definitions in a second section, and all 'linux-libre-*-pristine-source' definitions in a third, I suggest putting, for each kernel version, all three of these definitions together in one place. That way, when performing the most common kernel updates, everything that needs to be changed is in one place, and the corresponding patch to Guix would have just one hunk. More concretely, this would mean moving each 'deblob-scripts-X.Y' definition down, between the corresponding 'linux-libre-X.Y-version' and 'linux-libre-X.Y-pristine-source' definitions. What do you think? Mark From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Sep 2020 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Mark H Weaver Cc: 43173@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 43173-submit@debbugs.gnu.org id=B43173.15993326854810 (code B ref 43173); Sat, 05 Sep 2020 19:05:02 +0000 Received: (at 43173) by debbugs.gnu.org; 5 Sep 2020 19:04:45 +0000 Received: from localhost ([127.0.0.1]:44071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEdUT-0001FV-AA for submit@debbugs.gnu.org; Sat, 05 Sep 2020 15:04:45 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:34291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEdUR-0001FB-3A for 43173@debbugs.gnu.org; Sat, 05 Sep 2020 15:04:43 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 376B55C010D; Sat, 5 Sep 2020 15:04:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 05 Sep 2020 15:04:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=zP5XHn6SxznpqWkr/CWAueZq INqczCPNwXhQhKhnmOQ=; b=K6OnWLKlWgH7aHy3j2CNkaVenuP5a1rmMz+5fQg+ rgeoFcEREYTwMCWzHWoTKMbSsSyxusiQRYxHrDWXpH6qwN+iSQxHwPUA34fPqfL2 xldHOnSWwP8lNTb3RcRTwT+QrJsQqrGYZUBYCN8rTfTCN6sGpaTUt+vQopa8Rmyf hog= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=zP5XHn 6SxznpqWkr/CWAueZqINqczCPNwXhQhKhnmOQ=; b=jPbvA3P3ca89JHnJ9aCVcU ZR68ImuryY/G13qGgAy9jf2Hz+o8VrcSYjMMMKSlAuLP9Tld9TqDbHHoZxJi4PnV R477gV1bY4tAMK+eEHPzLKVJzsQZMVnrnG4yZ5miWb3zX8VFpX60VizBLzINoTVu Rc+icXCETl+2y1VPVGrqwoKgX2eVa/hQppRM8RUcK+PQTnBdQFi41xjkQdiRk3jv DLL+aJAnpZmzlybopy6OSOLJDUZS1n5G5TODnHtXBgX1tD+GWWDoT5vC1lPpTWuA Jlk+hkG+Zot55RdaZ8FdwJ3S4pIOSnWN1RJgWW+gGGG6c6Z7eUCTzjnPnnXo/28g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudeghedgudefvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtjeenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepiefghfeffedtffekveektddtieekfeffledtgfevkeekteeufedtfefhgefh keefnecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 8A2913280059; Sat, 5 Sep 2020 15:04:36 -0400 (EDT) Date: Sat, 5 Sep 2020 15:04:34 -0400 From: Leo Famulari Message-ID: <20200905190434.GA7847@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> <20200902221552.GA32317@jasmine.lan> <87zh67zqfa.fsf@netris.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FkmkrVfFsRoUs1wW" Content-Disposition: inline In-Reply-To: <87zh67zqfa.fsf@netris.org> X-Spam-Score: -0.7 (/) 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 (-) --FkmkrVfFsRoUs1wW Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 02, 2020 at 07:53:02PM -0400, Mark H Weaver wrote: > Instead of having all 'linux-libre-*-version' definitions in one > section, all 'deblob-scripts-*' definitions in a second section, and all > 'linux-libre-*-pristine-source' definitions in a third, I suggest > putting, for each kernel version, all three of these definitions > together in one place. That way, when performing the most common kernel > updates, everything that needs to be changed is in one place, and the > corresponding patch to Guix would have just one hunk. >=20 > More concretely, this would mean moving each 'deblob-scripts-X.Y' > definition down, between the corresponding 'linux-libre-X.Y-version' and > 'linux-libre-X.Y-pristine-source' definitions. >=20 > What do you think? That's better than what I had in mind =E2=80=94 thank you! I've attached a revised patch. --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-linux-libre-Enforce-the-use-of-the-correct-deblo.patch" Content-Transfer-Encoding: quoted-printable =46rom 6cbdf7e70ba0d9b98171a425bd249c702f8286de Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 5 Sep 2020 14:46:04 -0400 Subject: [PATCH] gnu: linux-libre: Enforce the use of the correct deblobbing scripts. * gnu/packages/linux.scm (deblob-scripts-5.8, deblob-scripts-5.4, deblob-scripts-4.19, deblob-scripts-4.14, deblob-scripts-4.9, deblob-scripts-4.4): Use the respective LINUX-LIBRE-X.Y-VERSION variables. --- gnu/packages/linux.scm | 71 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ae0bf081e9..ca9fa32e12 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -207,42 +207,6 @@ defconfig. Return the appropriate make target if appl= icable, otherwise return (file-name (string-append "linux-libre-deblob-check-" version)) (sha256 deblob-check-hash)))) =20 -(define deblob-scripts-5.8 - (linux-libre-deblob-scripts - "5.8.6" - (base32 "07z7sglyrfh0706icqqf3shadf638pvyid9386r661ds5lbsa2mw") - (base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7"))) - -(define deblob-scripts-5.4 - (linux-libre-deblob-scripts - "5.4.62" - (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb"))) - -(define deblob-scripts-4.19 - (linux-libre-deblob-scripts - "4.19.143" - (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") - (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) - -(define deblob-scripts-4.14 - (linux-libre-deblob-scripts - "4.14.196" - (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") - (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) - -(define deblob-scripts-4.9 - (linux-libre-deblob-scripts - "4.9.235" - (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") - (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) - -(define deblob-scripts-4.4 - (linux-libre-deblob-scripts - "4.4.235" - (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") - (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) - (define* (computed-origin-method gexp-promise hash-algo hash #:optional (name "source") #:key (system (%current-system)) @@ -383,7 +347,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." (sha256 hash))) =20 =20 +;; The current "stable" kernel. That is, the most recently released major +;; version. (define-public linux-libre-5.8-version "5.8.6") +(define deblob-scripts-5.8 + (linux-libre-deblob-scripts + linux-libre-5.8-version + (base32 "07z7sglyrfh0706icqqf3shadf638pvyid9386r661ds5lbsa2mw") + (base32 "0j6jba5fcddqlb42f95gjl78jisfla4nswqila074gglcrbnl9q7"))) (define-public linux-libre-5.8-pristine-source (let ((version linux-libre-5.8-version) (hash (base32 "180bka8a0f2ykaifgb323pzgh0n909mlrsk08l08zmifggnh19c= c"))) @@ -391,7 +362,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.8))) =20 +;; The "longterm" kernels =E2=80=94 the older releases with long-term upst= ream support. +;; Here are the support timelines: +;; (define-public linux-libre-5.4-version "5.4.62") +(define deblob-scripts-5.4 + (linux-libre-deblob-scripts + linux-libre-5.4-version + (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") + (base32 "1b3q88i2qfdxyvpi9f7jds0qlb8hfpw87mgia096ax6822c2cmyb"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) (hash (base32 "0w49y8lymz23x4mr5byaxnrkhm56lwfhnqkra07hqyfr5y63v21= 6"))) @@ -400,6 +379,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." deblob-scripts-5.4))) =20 (define-public linux-libre-4.19-version "4.19.143") +(define deblob-scripts-4.19 + (linux-libre-deblob-scripts + linux-libre-4.19-version + (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") + (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) (hash (base32 "1383yfwb962mhn25b3b3zqrwnpyp01g5xclsv14wra0fdz33ahr= a"))) @@ -408,6 +392,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." deblob-scripts-4.19))) =20 (define-public linux-libre-4.14-version "4.14.196") +(define deblob-scripts-4.14 + (linux-libre-deblob-scripts + linux-libre-4.14-version + (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") + (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) (hash (base32 "16mhqymwkgqi8zalcij5c754smc8ysvfw6l2cwshr4scipsv4qa= y"))) @@ -416,6 +405,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." deblob-scripts-4.14))) =20 (define-public linux-libre-4.9-version "4.9.235") +(define deblob-scripts-4.9 + (linux-libre-deblob-scripts + linux-libre-4.9-version + (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") + (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) (hash (base32 "1hqcb3zw4546h6x5xy2mywdznha8813lx15mxbgfbvwm4qhsc9g= 6"))) @@ -424,6 +418,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the g= iven DEBLOB-SCRIPTS." deblob-scripts-4.9))) =20 (define-public linux-libre-4.4-version "4.4.235") +(define deblob-scripts-4.4 + (linux-libre-deblob-scripts + linux-libre-4.4-version + (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") + (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) (hash (base32 "0w5pkv936zb0shjgnpv17gcp5n8f91djznzq54p6j1bl5q2qdyq= d"))) --=20 2.28.0 --PEIAKu/WMn1b1Hv9-- --FkmkrVfFsRoUs1wW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl9T4T8ACgkQJkb6MLrK fwi/wg//cOlGRNtnTcRQZnoJQMHtPsIEy46kcbozIQFxzEb8VOFWVAd7c/nju2QY eFJKe60v2JPHiqSNS3lhTeM7C18WBZYzGG889oge8SmUdQlnoDE02YeWnao8YoQD 46ir2gs/h/IJJmQiTrFQVxFxG1T/eFVvqoX+FyuTEArorM8UDmMOz6nyyf//u3sI JY0ETHKQ4O8BKZoqgqbrG9YfwoRjGf9Z+lEgh7AiAeoJoROgWTV0OSTFNPLaG+ST ltcy0DAvFnE71Y5evMTXhKrMHDrIoxbtDFB4zuyQaIhRto+4qELJkEe6CdbWx0L4 yTEiRN/D0Vfa6P9qFUKYdK10ysD2jCt1E9y2xemtDIOIKxU620s0PAgmzjIWFmbT bb7ED6rRUbH8H758Wf7IDcUdfLRlozQnFCpjYVNgO35hxsMZucg51JL1oG2qe3vr Q07fKdE2RzaWNP6ASWlPI03KpSlXfwUY9tKG8UYnfyNlSBmhUO+kaO/QVUW+6Xr/ xfDd+SbIideAMyM6c+03thIhRxztaf8QNGxQO8qbGUkMcqFfU06CG23AiABEzxzM D93q1M5hGEvwA5isMKtCl8PFJibiFzEWFjhIEsabDnyhUAiZbYUuTch239uYUOy4 s/DPkzWavo4piZc7IUMIt7HkrnLJ1WfjzFUq82h+2JLvyyC7YUo= =dydx -----END PGP SIGNATURE----- --FkmkrVfFsRoUs1wW-- From unknown Fri Aug 15 15:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] Ensure that the correct linux-libre deblobbing scripts are used Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Sep 2020 23:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Famulari Cc: 43173@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 43173-submit@debbugs.gnu.org id=B43173.159934730711451 (code B ref 43173); Sat, 05 Sep 2020 23:09:02 +0000 Received: (at 43173) by debbugs.gnu.org; 5 Sep 2020 23:08:27 +0000 Received: from localhost ([127.0.0.1]:44348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEhIJ-0002yd-0v for submit@debbugs.gnu.org; Sat, 05 Sep 2020 19:08:27 -0400 Received: from world.peace.net ([64.112.178.59]:60692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEhIH-0002yP-2u for 43173@debbugs.gnu.org; Sat, 05 Sep 2020 19:08:25 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kEhIA-0006rO-Jq; Sat, 05 Sep 2020 19:08:18 -0400 From: Mark H Weaver In-Reply-To: <20200905190434.GA7847@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> <20200902221552.GA32317@jasmine.lan> <87zh67zqfa.fsf@netris.org> <20200905190434.GA7847@jasmine.lan> Date: Sat, 05 Sep 2020 19:07:01 -0400 Message-ID: <87r1rfrff3.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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.0 (-) Leo Famulari writes: > That's better than what I had in mind =E2=80=94 thank you! I've attached a > revised patch. > From 6cbdf7e70ba0d9b98171a425bd249c702f8286de Mon Sep 17 00:00:00 2001 > From: Leo Famulari > Date: Sat, 5 Sep 2020 14:46:04 -0400 > Subject: [PATCH] gnu: linux-libre: Enforce the use of the correct deblobb= ing > scripts. > > * gnu/packages/linux.scm (deblob-scripts-5.8, deblob-scripts-5.4, > deblob-scripts-4.19, deblob-scripts-4.14, deblob-scripts-4.9, > deblob-scripts-4.4): Use the respective LINUX-LIBRE-X.Y-VERSION variables. This new patch looks good to me. Feel free to push. Thanks! Mark From unknown Fri Aug 15 15:56:07 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#43173: closed (Re: Ensure that the correct linux-libre deblobbing scripts are used) Message-ID: References: <20200906200139.GA792@jasmine.lan> <20200902182922.GA26301@jasmine.lan> X-Gnu-PR-Message: they-closed 43173 X-Gnu-PR-Package: guix-patches Reply-To: 43173@debbugs.gnu.org Date: Sun, 06 Sep 2020 20:02:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1599422522-28779-1" This is a multi-part message in MIME format... ------------=_1599422522-28779-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #43173: Ensure that the correct linux-libre deblobbing scripts are used which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 43173@debbugs.gnu.org. --=20 43173: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D43173 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1599422522-28779-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 43173-done) by debbugs.gnu.org; 6 Sep 2020 20:01:48 +0000 Received: from localhost ([127.0.0.1]:47208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kF0rE-0007Tm-LO for submit@debbugs.gnu.org; Sun, 06 Sep 2020 16:01:48 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kF0rD-0007TY-6l for 43173-done@debbugs.gnu.org; Sun, 06 Sep 2020 16:01:47 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id D88355C005B; Sun, 6 Sep 2020 16:01:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 06 Sep 2020 16:01:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=GWpbLxs5FBpLADafYGtW8Upg j0tVp/pkS8IkeJM3zl0=; b=MfNCwiApfKjHLd8fNxzdrQKFJ6DUg3nrK/S+jQ6Y Bi5jHrlEaLWoy0jVZMoteHA2+VXxAGcU9cuyQZdWv1flNxJPSoY8OvSVQ06HW8OY 8epvtniz+2P97fEBIcEUuoQZ91OVncTWvYfEfOPveNkBZR0H/G8tUuHvrRBngXMd /l4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=GWpbLx s5FBpLADafYGtW8Upgj0tVp/pkS8IkeJM3zl0=; b=lWCThG9TQGwfZkOJMVI+w0 +MIuacHNNLii+2n9fS7sbvY6fsz8N6rHYN+5nLWesIxff5+8wybju67Ru6VwZy58 71EvYx/sAFxCNESKeYfNAx+oLdiF/K17v3ISyDXmEQnf1tZinJY6tPFGOoC0+17g Y4Sx3+2yLaXDYCFgEjUURibAFBLXh10ihSOcBACmnuS/VyRvhEbnFJTAFYP1Wvp5 SbjN9xhP9RNQDPsOPY+u5VZgkhgQvAx0qiFjhL8KXKYHNLM2gtii803CNjmy0F8T aux3tvNHw0NtLnvdAWAjRM+4pZEFHmwy5oqLjVfODJj/G1M15Cfh2DKL3y9hs3Sg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudegjedgudegjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtjeenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepiefghfeffedtffekveektddtieekfeffledtgfevkeekteeufedtfefhgefh keefnecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 646B9306467E; Sun, 6 Sep 2020 16:01:41 -0400 (EDT) Date: Sun, 6 Sep 2020 16:01:39 -0400 From: Leo Famulari To: Mark H Weaver Subject: Re: Ensure that the correct linux-libre deblobbing scripts are used Message-ID: <20200906200139.GA792@jasmine.lan> References: <20200902182922.GA26301@jasmine.lan> <87363z28fs.fsf@netris.org> <20200902221552.GA32317@jasmine.lan> <87zh67zqfa.fsf@netris.org> <20200905190434.GA7847@jasmine.lan> <87r1rfrff3.fsf@netris.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gBBFr7Ir9EOA20Yy" Content-Disposition: inline In-Reply-To: <87r1rfrff3.fsf@netris.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 43173-done Cc: Maxim Cournoyer , 43173-done@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 (-) --gBBFr7Ir9EOA20Yy Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 05, 2020 at 07:07:01PM -0400, Mark H Weaver wrote: > Leo Famulari writes: >=20 > > That's better than what I had in mind =E2=80=94 thank you! I've attache= d a > > revised patch. > > From 6cbdf7e70ba0d9b98171a425bd249c702f8286de Mon Sep 17 00:00:00 2001 > > From: Leo Famulari > > Date: Sat, 5 Sep 2020 14:46:04 -0400 > > Subject: [PATCH] gnu: linux-libre: Enforce the use of the correct deblo= bbing > > scripts. > > > > * gnu/packages/linux.scm (deblob-scripts-5.8, deblob-scripts-5.4, > > deblob-scripts-4.19, deblob-scripts-4.14, deblob-scripts-4.9, > > deblob-scripts-4.4): Use the respective LINUX-LIBRE-X.Y-VERSION variabl= es. >=20 > This new patch looks good to me. Feel free to push. Thanks for your review! Pushed as fe752d8c4545735edd71362805cbe78b78b8e9ab --gBBFr7Ir9EOA20Yy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl9VQCMACgkQJkb6MLrK fwhQVxAA7iLPTYvE1CNiuLgywUPOUG/8JKpoSZPRejKvh9wnviN/+UcGeyFu0GRq Cnx7wD5uZ32RPEcXBju2g1g0k6JhvNZn8pULr+0t0uBFcpnVeqbntHHh1fDNMM/I t3wMwkhAeHz8bWuswENPPEDPdw1ZDdRndL8Ohq77Kuc1INl7wEROMkunS1M28kvj fnIMqaXPpXMXguwDiePTw7rK9bMvudMiwviu2LndAqQBmGRfHhHcA2kLUZo7O9uO hbk4JPcvTD4CtnOxGba9HqTfiXiXsFWlVh7X18htkMwM8uQBSUGa7ANoTA5nnVX9 WFS4jqGUAZ9lQH+8MxU8Cd+hOp8wn/Ubr+uMJUJLHF0GK8hBLtjlGmOrI25FcxU3 CNs3swZ0Vup3zMHDTPS6SXeTF5Yot3YLqGmSasTixi/JANT1DVXqMJ95ilNOpgcB LBLxytatyl+53sPDJRDRo6NoQkpr2prZ4yJxnKskskLl7YmXRSsIvIJI76xRIuav JT4qseRvpf+3IMwdajSRLfVGLU7MXFV8NrRhlZwTfn971KFK0t4xKTRsg0JHKd/W 5XK/Od+oxwuyUnw697a+31fEXD2+e0PU8+L7HNkxsw3YR8w514Xm8DUPHh2jBVnf XYxEHzjAWKJ+AgqgQZhuamyUBHGWRrGfbtQfRlcWaV2sGRVpGX8= =MJ9s -----END PGP SIGNATURE----- --gBBFr7Ir9EOA20Yy-- ------------=_1599422522-28779-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Sep 2020 18:29:32 +0000 Received: from localhost ([127.0.0.1]:60691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXVk-00065L-A5 for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:29:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:34930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXVi-00065D-Dl for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:29:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXVi-0007Ok-7J for guix-patches@gnu.org; Wed, 02 Sep 2020 14:29:30 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:57461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXVg-0002zE-AV for guix-patches@gnu.org; Wed, 02 Sep 2020 14:29:29 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 57727F8D; Wed, 2 Sep 2020 14:29:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 14:29:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=mesmtp; bh=M2jjTV5/f4irCY5TEfeHEC+1DdLNlDWVXk81rhYl+i4=; b=Xl hE1Hw18E3rYgfZ+2NffbrO993cCZmtIen5BFByuGhKJKE5Zd1LASEx70CuSuVZSs DtP6aZ8X5VCIB2MJAAtaiBNiRInbKijBJdKu7O2kmdH/riofqKhA9COoUnN9yJb1 8RQ/GASeNG1Yk4hwyxA/a49zWgXx2z5uCcu/uh1Aw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=M2jjTV5/f4irCY5TEfeHEC+1DdLNl DWVXk81rhYl+i4=; b=YTFzjtqWJQbU619o60uL34eV3yS6mKpmDNBKPxzZjCV6A A5JCaqn6RTARtFuhisaKVdAQkce6Lb6VMJQgX3WtpwXwvqpuFj92JfhiRwCpbIsA s8Q96fbZ6twty1jZ5biOB5+UkBKe27JRHZoYHnDQj+V7VKgtmImCtyyCsHSkceLu eNvZEa6TpSevwiUPPwWnzspalVxPn92fLPSzNH1KHArHCs8JyOiNRhWoMp74Fy0G kcNTyVZWAu9EZypFW8JRUFH2Sv0VUegtEH9Re6E1ZNdEGlJxOmAjKop83a2PrLrr d0x4LxLU9B5hXvGQyUMy62mFPjFn/aJhoeuiuTu2A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudefledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkgggtugesghdtreertddtjeenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepudeludeujefggefhteekudekveevueffleefleffgeegteevgeekveehffejteeh necuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeejfedrudeguddruddvjedrudegie enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvgho sehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 54A00306005E; Wed, 2 Sep 2020 14:29:24 -0400 (EDT) Date: Wed, 2 Sep 2020 14:29:22 -0400 From: Leo Famulari To: guix-patches@gnu.org Subject: Ensure that the correct linux-libre deblobbing scripts are used Message-ID: <20200902182922.GA26301@jasmine.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RnlQjJ0d97Da+TV1" Content-Disposition: inline Received-SPF: pass client-ip=64.147.123.25; envelope-from=leo@famulari.name; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 14:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Mark H Weaver , Maxim Cournoyer 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: -2.4 (--) --RnlQjJ0d97Da+TV1 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In recent discussions [0], people raised the possibility that we might accidentally leave non-free firmware blobs in our linux-libre packages. If I understand correctly, the root of the issue is that, currently, we manually specify the versions of the deblobbing scripts. They are not changed with every linux-libre release, so it is usually okay to use an older version number =E2=80=94 the scripts themselves will be identical. However, sometimes the scripts do change, and we might not notice, and thus we would fail to remove every blob from the kernel sources. These two patches should make that failure mode impossible, by 1) making sure that the file names of the deblobbing scripts' store items include the full version number of the kernel and 2) only defining the version in one place. The hashes of the deblob scripts will be checked automatically when Guix downloads them for each new kernel release. I had to move the linux-libre-nnn-version variables to an earlier part of the file, so that they are defined when referenced in the deblob-scripts-nnn procedures. I regret changing the way this code is organized... your advice is welcome! [0] https://lists.gnu.org/archive/html/guix-devel/2020-08/msg00040.html --RnlQjJ0d97Da+TV1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl9P5H4ACgkQJkb6MLrK fwgpEA/9GyAQspYSOkYvlPIJT9vidZpcB8RJX/0anf5gLRy/i00FXlA5t8Kx9Ewz 5JSmTjkXftfQfXsOL7ip//XkEHqUBMPU2uhNTUg4SEWmiwoiaWVgwAXXqOoqU2xr Qs5VLL8BNM+So4M926X0+lBld0+e+54RW8bDz6pcofBbzcLb7GZRfeUnj9nJaBPv Bgek3wGERkMivv9stkU55dKLhU55OuFB9O8GNQaZX1EpzOf61uzmNMErmVU4odsX 03IixwDy68hKVBehVg8AqI+eEv/pRu7VnOQ0E3Qum1Wb3wnnZ5dHrBUhz3pvMraZ Ni0NG6OjFK3UUTFMcfBo908BhIzEg+Tan8V2IoknE5VYaXV07ZDPXzRdg9hV3Zlt bFHjxyjKT3HgQIKj56y4XvPg7mIfurrY7kgS8lBD5FgdOt1DE7eVCOHliHRwqP3c 8mVeu1nNHyYf8BLE2JViwmTdbagJY49FJ8Ak1zIb2elEKYsGrExkxcfkWZ3mnGF5 WloquobBnbfLxQcdwmGV7VTHiYniHkW37iR/idb5wx9gupR+xP224caS3GuU8y2X ZdyqZ+FjP1P0mFb1hQd8SPMox1bC8rLCuQw7eZkKv/Gn9sVP4XI+vQ3DJC6tcurm mizpNXGDwONxNBkyKi3HQEWpITSan1XW7jlgDSBfmoFsr0xNiyk= =0LIu -----END PGP SIGNATURE----- --RnlQjJ0d97Da+TV1-- ------------=_1599422522-28779-1--