From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8EF+MTnlT1/4JQAA0tVLHw (envelope-from ) for ; Wed, 02 Sep 2020 18:32:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qDNHLTnlT1+EYAAAB5/wlQ (envelope-from ) for ; Wed, 02 Sep 2020 18:32:25 +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 7131B940704 for ; Wed, 2 Sep 2020 18:32:25 +0000 (UTC) Received: from localhost ([::1]:58652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDXYW-0000Zi-CX for larch@yhetil.org; Wed, 02 Sep 2020 14:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXYC-0000NM-Dx for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDXYC-0003Sr-3z for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDXYB-0006BC-0u for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:03 -0400 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 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 (body hash did not verify) header.d=famulari.name header.s=mesmtp header.b=dYG04FKi; dkim=fail (body hash did not verify) header.d=messagingengine.com header.s=fm3 header.b=JU+LmW87; 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: 4.99 X-TUID: oZLqTxkT3IU0 * 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