From patchwork Thu Jul 18 00:59:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 29356 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 D41C227BBEA; Thu, 18 Jul 2024 02:01:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 32A4D27BBE2 for ; Thu, 18 Jul 2024 02:01:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUFW1-0000Br-Hl; Wed, 17 Jul 2024 21:01:01 -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 1sUFVz-0000Bd-D7 for guix-patches@gnu.org; Wed, 17 Jul 2024 21:00:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sUFVz-00030Y-4S for guix-patches@gnu.org; Wed, 17 Jul 2024 21:00:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sUFW2-0001x5-HY for guix-patches@gnu.org; Wed, 17 Jul 2024 21:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72164] linux-libre packaging: Learn to apply deblob script "errata" patches References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jul 2024 01:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72164 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72164@debbugs.gnu.org Received: via spool by 72164-submit@debbugs.gnu.org id=B72164.17212644107428 (code B ref 72164); Thu, 18 Jul 2024 01:01:02 +0000 Received: (at 72164) by debbugs.gnu.org; 18 Jul 2024 01:00:10 +0000 Received: from localhost ([127.0.0.1]:36426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sUFVB-0001vk-E1 for submit@debbugs.gnu.org; Wed, 17 Jul 2024 21:00:10 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:36621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sUFV7-0001tX-G4 for 72164@debbugs.gnu.org; Wed, 17 Jul 2024 21:00:07 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.nyi.internal (Postfix) with ESMTP id 7CE48138016D; Wed, 17 Jul 2024 20:59:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 17 Jul 2024 20:59:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s= mesmtp; t=1721264396; x=1721350796; bh=Mecyt46lkqUmaFz/Jc6FC354/ dKx9ey5L8oGj4fs4Dw=; b=PvSLWj6rwjs86v1fBd94SaloCFWxTqbhYjE8erFiP QmUywh3ZnY6WA8Dx3QnvSqQVMmCQ5hZm5TZQIUuHGCdA6Fd5T6JHnVk93hyd3YI3 QYOHNVRJaQYNTK1vvUEV2GsjcabFBf872FfOFIiRLFIYOVgOw7dJ3P+gtigKSxEr u8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1721264396; x=1721350796; bh=Mecyt46lkqUmaFz/Jc6FC354/dKx9ey5L8o Gj4fs4Dw=; b=FwzqKXxxJ7Tt0AEATx2ksrcOH7zNCKmjiz0rgushwlqVVLAqQ+/ OwaGZBiaoVEzXdNSHlJmLhKnKbZloDou2HY1ckr3AEc8EDEZgxDQkKt+ujFa9tNo BBrwvHVgCefnIzn8nnXFDwJn9FAJT/SG7DoSTMUril1RngysGVtid9C9inF8NGFX 575Sgml4Ezv7XNesqjiZTaw0kagGlC6eO0rGlywxZTBxSuyk9OVGLmu+GaB8UvWe NpOeU3OW3Pv+VBrX60+tU/NOwinc2uEIp4yXdeMVQFy5bShgMdHsDeiLFEZhWAjM 0p+Pfrgi95FRxEP26kv0gjk63rYlIpQx/PA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgeekgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehgtderredttd dvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpedvheeuveevgfegfffhiefghffhvdfggfehgf dtjefgffetudefiedvjeekleegtdenucffohhmrghinhepghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuh hlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <72164@debbugs.gnu.org>; Wed, 17 Jul 2024 20:59:54 -0400 (EDT) Date: Wed, 17 Jul 2024 20:59:29 -0400 From: Leo Famulari Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches I tested the build of linux-libre 6.10 with the attached patches, and it failed as dariqq said it would on #guix, because this kernel series requires an update to the 'dwarves' package. I'm building again with the dwarves update now. https://logs.guix.gnu.org/guix/2024-07-17.log#204228 Also, these errata patches will only be required for 6.10, and not subsequent releases in this series (6.10.1, etc). We don't often end up including the mainline release in Guix, but rather the subsequent stable releases, so in this case, it's not really necessary to add this functionality. Although it would be nice. From 3659eaef947623d502708441cfd6531acdc0fd90 Mon Sep 17 00:00:00 2001 Message-ID: <3659eaef947623d502708441cfd6531acdc0fd90.1721264342.git.leo@famulari.name> From: Leo Famulari Date: Wed, 17 Jul 2024 16:05:13 -0400 Subject: [PATCH 1/3] gnu: linux-libre: Add the ability to apply errata patches to the deblobbing scripts. * gnu/packages/linux.scm (linux-libre-deblob-scripts): Accept an optional parameter DEBLOB-ERRATA-PATCHES. Change-Id: If3c87f713637428e1cd2eaf5ef962b8005395805 --- gnu/packages/linux.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: 6cfc88e3be73904fc87443cdd5c7d7961923e848 prerequisite-patch-id: 58efdd6ff2418b91eae89e7964de00b95f83105f diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5aa712df7..0defc03e7a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,9 +359,11 @@ (define-public (system->defconfig system) ;;; Kernel source code deblobbing. ;;; -(define (linux-libre-deblob-scripts version gnu-revision +(define* (linux-libre-deblob-scripts version gnu-revision deblob-hash - deblob-check-hash) + deblob-check-hash + #:optional + (deblob-errata-patches '())) (list (version-major+minor version) (origin (method url-fetch) @@ -370,6 +372,8 @@ (define (linux-libre-deblob-scripts version gnu-revision "deblob-" (version-major+minor version))) (file-name (string-append "linux-libre-deblob-" version "-" gnu-revision)) + (patches + (map search-patch deblob-errata-patches)) (sha256 deblob-hash)) (origin (method url-fetch)