From patchwork Fri Nov 4 19:23:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 44306 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E3E7C27BBEB; Fri, 4 Nov 2022 19:24:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 59A2427BBE9 for ; Fri, 4 Nov 2022 19:24:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1or2IO-0001Jz-Mp; Fri, 04 Nov 2022 15:24:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1or2IM-0001Jq-W4 for guix-patches@gnu.org; Fri, 04 Nov 2022 15:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1or2IM-0001y8-NH for guix-patches@gnu.org; Fri, 04 Nov 2022 15:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1or2IM-0001wD-6s for guix-patches@gnu.org; Fri, 04 Nov 2022 15:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59022] [PATCH] gnu: linux-libre: Update to 6.0.7. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Nov 2022 19:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59022@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16675898357435 (code B ref -1); Fri, 04 Nov 2022 19:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2022 19:23:55 +0000 Received: from localhost ([127.0.0.1]:54860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1or2IF-0001vr-3J for submit@debbugs.gnu.org; Fri, 04 Nov 2022 15:23:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:40684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1or2IA-0001vg-8B for submit@debbugs.gnu.org; Fri, 04 Nov 2022 15:23:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1or2I9-0001HB-Rl for guix-patches@gnu.org; Fri, 04 Nov 2022 15:23:50 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1or2I7-0001we-Je for guix-patches@gnu.org; Fri, 04 Nov 2022 15:23:49 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id CD3F2320096C; Fri, 4 Nov 2022 15:23:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 04 Nov 2022 15:23:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; t=1667589822; x=1667676222; bh=ic8tSUX OHGwBNPdy9IH7D/z8+QbuNBIJQma3uqIIPx8=; b=KpdohRBDO56+JjzaV7Vgrq6 oomnMwGEPhAQ7J7nquTNkxMurkGHDD4ap60z5VyHEmSzY+JcbEBcR9R5EedXbD0E 7XeHsTQTHvgHbrANbdo2WvwMhmawBE5ha3V46C9ITbiwiFojNCVxiEHuxMiT4Q1X IBQyuPsCCfYIaFEyqeEQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1667589822; x=1667676222; bh=ic8tSUXOHGwBNPdy9IH7D/z8+Qbu NBIJQma3uqIIPx8=; b=BS9xVuR4IjipMmHr6WZH0lADyzYnugWPgPY7bBmRIhQJ 5YT9QXxe3cW24g7EzG3ujyt8waLHOzwiMr/IKhmQvSAG4sv4Z5nqihkXF7u/spOO y/cnVqPeD4c0WM4pLN0xQbkkk79v9gJiRumuz15eHyJsAlJrLJYemPp10SRl89B4 tRCHkGYyXZbaXtZM7DEmty/UDb6hO2pD/qChHItyu2bZHYvsAQR9VKPmYFwaF5A9 ur6K3iaV0Wja7oD6Gwim52NS/2nwzNrwEmF+nCAsJCRIkuVCm2x2BTg6oW2duyh2 HUsoYE3vWSVocfGtNw5SrkEPyU/mjOSuPvAHjw8PCg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvddugdduvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedtffetkeeileffleevleetgfdtleekgf ffvdeujedvhfffheeigeelieegheeludenucffohhmrghinhepkhgvrhhnvghlrdhorhhg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 4 Nov 2022 15:23:42 -0400 (EDT) From: Leo Famulari Date: Fri, 4 Nov 2022 15:23:38 -0400 Message-Id: X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.25; envelope-from=leo@famulari.name; helo=wout2-smtp.messagingengine.com 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_H2=-0.001, SPF_HELO_PASS=-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: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (linux-libre-5.19-version, linux-libre-5.19-gnu-revision, deblob-scripts-5.19, linux-libre-5.19-pristine-source, linux-libre-5.19-source, linux-libre-headers-5.19, linux-libre-5.19): Remove variables. (linux-libre-version, linux-libre-gnu-revision, linux-libre-pristine-source, linux-libre-source, linux-libre, linux-libre-with-bpf): Use linux-libre 6.0. --- gnu/packages/linux.scm | 50 +++++++----------------------------------- 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf11a7fc1b..b208d24a50 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,22 +370,6 @@ (define-public linux-libre-6.0-pristine-source (%upstream-linux-source version hash) deblob-scripts-6.0))) - -(define-public linux-libre-5.19-version "5.19.17") -(define-public linux-libre-5.19-gnu-revision "gnu") -(define deblob-scripts-5.19 - (linux-libre-deblob-scripts - linux-libre-5.19-version - linux-libre-5.19-gnu-revision - (base32 "1lk90psz33ldb8aiaws4iayhycl5bmywr6badvzffjpr87s5phxw") - (base32 "092myqjixvy1k3ylcj0hfc4whfxapjvxsxm4gk30a3jv5dnh7mly"))) -(define-public linux-libre-5.19-pristine-source - (let ((version linux-libre-5.19-version) - (hash (base32 "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9"))) - (make-linux-libre-source version - (%upstream-linux-source version hash) - deblob-scripts-5.19))) - ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; @@ -512,11 +496,6 @@ (define-public linux-libre-6.0-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) -(define-public linux-libre-5.19-source - (source-with-patches linux-libre-5.19-pristine-source - (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch))) - (define-public linux-libre-5.15-source (source-with-patches linux-libre-5.15-pristine-source (list %boot-logo-patch @@ -631,11 +610,6 @@ (define-public linux-libre-headers-6.0 linux-libre-6.0-gnu-revision linux-libre-6.0-source)) -(define-public linux-libre-headers-5.19 - (make-linux-libre-headers* linux-libre-5.19-version - linux-libre-5.19-gnu-revision - linux-libre-5.19-source)) - (define-public linux-libre-headers-5.15 (make-linux-libre-headers* linux-libre-5.15-version linux-libre-5.15-gnu-revision @@ -968,19 +942,11 @@ (define-public linux-libre-6.0 "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-5.19 - (make-linux-libre* linux-libre-5.19-version - linux-libre-5.19-gnu-revision - linux-libre-5.19-source - '("x86_64-linux" "i686-linux" "armhf-linux" - "aarch64-linux" "powerpc64le-linux" "riscv64-linux") - #:configuration-file kernel-config)) - -(define-public linux-libre-version linux-libre-5.19-version) -(define-public linux-libre-gnu-revision linux-libre-5.19-gnu-revision) -(define-public linux-libre-pristine-source linux-libre-5.19-pristine-source) -(define-public linux-libre-source linux-libre-5.19-source) -(define-public linux-libre linux-libre-5.19) +(define-public linux-libre-version linux-libre-6.0-version) +(define-public linux-libre-gnu-revision linux-libre-6.0-gnu-revision) +(define-public linux-libre-pristine-source linux-libre-6.0-pristine-source) +(define-public linux-libre-source linux-libre-6.0-source) +(define-public linux-libre linux-libre-6.0) (define-public linux-libre-5.15 (make-linux-libre* linux-libre-5.15-version @@ -1210,9 +1176,9 @@ (define-public linux-libre-mips64el-fuloong2e (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre* - linux-libre-5.19-version - linux-libre-5.19-gnu-revision - linux-libre-5.19-source + linux-libre-6.0-version + linux-libre-6.0-gnu-revision + linux-libre-6.0-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:extra-version "bpf"