From patchwork Mon Feb 27 22:32:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 47461 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 4E23616C10; Mon, 27 Feb 2023 22:33:24 +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=-1.8 required=5.0 tests=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 95F3D16BF0 for ; Mon, 27 Feb 2023 22:33:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWm3S-0000VF-Oa; Mon, 27 Feb 2023 17:33:10 -0500 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 1pWm3K-0000IC-VO for guix-patches@gnu.org; Mon, 27 Feb 2023 17:33:03 -0500 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 1pWm3K-0002PC-MH for guix-patches@gnu.org; Mon, 27 Feb 2023 17:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWm3K-0008Oe-IJ for guix-patches@gnu.org; Mon, 27 Feb 2023 17:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61770] [PATCH v4 1/2] gnu: Fix kernel source infodoc patching for linux-libre >= 6.2. References: <333f72ea93790a6ed6124fe7261dfcdf2d448ef2.1677273558.git.leo@famulari.name> In-Reply-To: <333f72ea93790a6ed6124fe7261dfcdf2d448ef2.1677273558.git.leo@famulari.name> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61770@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61770-submit@debbugs.gnu.org id=B61770.167753717532256 (code B ref 61770); Mon, 27 Feb 2023 22:33:02 +0000 Received: (at 61770) by debbugs.gnu.org; 27 Feb 2023 22:32:55 +0000 Received: from localhost ([127.0.0.1]:49075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWm3D-0008OC-3X for submit@debbugs.gnu.org; Mon, 27 Feb 2023 17:32:55 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWm35-0008NT-De for 61770@debbugs.gnu.org; Mon, 27 Feb 2023 17:32:49 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5E9315C00F1; Mon, 27 Feb 2023 17:32:41 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 27 Feb 2023 17:32:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; t=1677537161; x=1677623561; bh=oP4gLw4 fMUJYVFMN5l5kXjNOf5Kohveat34LE2jFmTo=; b=MvOamVVTh7SqbuK+oDxmMat kU33fMgj+sgbOUssNE3VyQKh48tmY8L9RubEwUU9ILT2LMMoZHmmpCMGoGr/Wwqi WBnIOQuPaR4iyFcONQ7SsikyNQaWXifDGjGdB70JtmDDwqi7xQAEGigVheAupfcQ S2wQWiZqMD3h8NzmLUzM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=fm1; t= 1677537161; x=1677623561; bh=oP4gLw4fMUJYVFMN5l5kXjNOf5Kohveat34 LE2jFmTo=; b=OjmCS2NeFuXTueZpGyR/iNVFqgX2gI4Uvtn9cz9f8iRmBC7USYI H4NuK2NyrtVPgAZ1bJ3W43s1Q9JRcpRXkQM5/Q/h5LhYrtHk4st0UtDIAzaYY9Cv SFmuvT1o+uUySqOc6PWXUpGSVATAR6TQNLf3UNLOT1+kHVNlx6OTX9MJlGgDcvK+ ujx4RgTONnlQJYtnzSrR0WqC6TS9FlhFsxT6fFDjEExFTnz96uASdJxg0YqcifjY 3NbCQyazvu6Q0g76iyQfZArJoM+DwZf0el2ShXYKc0mITUuEH1zb0q8SUNvv7BJn SaCNuxLyXbbgiQ4W4Fve4gNiFkSNFr8o1ww== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudeludcutefuodetggdotefrodftvfcurf hrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhl rghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpe ffffdujeeuudevfeetfefgveegleejhfehteehveeuteejueejkeejjefhtdejveenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrg hmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 27 Feb 2023 17:32:40 -0500 (EST) From: Leo Famulari Date: Mon, 27 Feb 2023 17:32:36 -0500 Message-Id: <20230227223237.72182-1-leo@famulari.name> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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 From: Maxim Cournoyer * gnu/packages/linux.scm (doc-supported?): Rename to ... (apply-infodoc-patch?): ... new variable with different kernel version constraints. (make-linux-libre): Adjust accordingly. --- gnu/packages/linux.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3601744c51..22ebaea243 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -863,10 +863,12 @@ (define (config->string options) ;;; Kernel package utilities. ;;; -(define (doc-supported? version) +(define (apply-infodoc-patch? version) ;; Versions older than 5.10 have different enough build scripts that the ;; infodocs patch doesn't apply. - (version>=? version "5.10")) + (and (version>=? version "5.10") + (not (version>=? version "6.2")))) ;patch applied upstream + (define* (make-linux-libre version gnu-revision hash-string supported-systems #:key @@ -879,7 +881,7 @@ (define* (make-linux-libre version gnu-revision hash-string supported-systems (extra-options %default-extra-linux-options) (patches `(,%boot-logo-patch - ,@(if (doc-supported? version) + ,@(if (apply-infodoc-patch? version) (list (search-patch "linux-libre-infodocs-target.patch")) '()))))