From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2CKmE2XhU1+5fwAA0tVLHw (envelope-from ) for ; Sat, 05 Sep 2020 19:05:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mCijD2XhU195awAA1q6Kng (envelope-from ) for ; Sat, 05 Sep 2020 19:05:09 +0000 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 2943F9404C2 for ; Sat, 5 Sep 2020 19:05:08 +0000 (UTC) Received: from localhost ([::1]:51978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEdUo-0007gf-3Q for larch@yhetil.org; Sat, 05 Sep 2020 15:05:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEdUk-0007gS-Pd for guix-patches@gnu.org; Sat, 05 Sep 2020 15:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEdUk-0001cq-Gb for guix-patches@gnu.org; Sat, 05 Sep 2020 15:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kEdUk-0001GF-C7 for guix-patches@gnu.org; Sat, 05 Sep 2020 15:05:02 -0400 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 X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=famulari.name header.s=mesmtp header.b=K6OnWLKl; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm3 header.b=jPbvA3P3; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -2.11 X-TUID: 672dqO/UFzEa --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--