From patchwork Mon Feb 27 17:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 47451 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 886EB16BF5; Mon, 27 Feb 2023 17:17:20 +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 C86FE16A98 for ; Mon, 27 Feb 2023 17:17:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWh7Z-00054K-UC; Mon, 27 Feb 2023 12:17:05 -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 1pWh7X-00053Q-0p for guix-patches@gnu.org; Mon, 27 Feb 2023 12:17: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 1pWh7W-0005yw-Oa for guix-patches@gnu.org; Mon, 27 Feb 2023 12:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWh7W-0006XD-JW for guix-patches@gnu.org; Mon, 27 Feb 2023 12:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61770] [PATCH v3 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 17:17: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.167751817025038 (code B ref 61770); Mon, 27 Feb 2023 17:17:02 +0000 Received: (at 61770) by debbugs.gnu.org; 27 Feb 2023 17:16:10 +0000 Received: from localhost ([127.0.0.1]:48694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWh6f-0006Vl-Qe for submit@debbugs.gnu.org; Mon, 27 Feb 2023 12:16:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:54579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWh6Y-0006Uj-Lv for 61770@debbugs.gnu.org; Mon, 27 Feb 2023 12:16:04 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 240395C00D0; Mon, 27 Feb 2023 12:15:57 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Feb 2023 12:15:57 -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=1677518157; x=1677604557; bh=oP4gLw4 fMUJYVFMN5l5kXjNOf5Kohveat34LE2jFmTo=; b=hjO7HCQ8h8eCcgeab5Iv68m aZtxE9KcDuNX9GjqE3Qpi/VfgzK2uQxEVJm/y0nRGTWSzkfyAW6sQJscLN4h6OHK eSX83eAsPe4WIq886EGMFyiKCOrLYuU57STP/MVIpCiO9/uADam0jSoDg0ittHne uZAfB6ornILmrVY8EZ4Y= 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= 1677518157; x=1677604557; bh=oP4gLw4fMUJYVFMN5l5kXjNOf5Kohveat34 LE2jFmTo=; b=OhOvKta8sRA8Jod/Jcq7CZGQaq5UgrfhqmXfEjvI8rwzALwW4Zk j4qCxE79eWl4eqYDNGS3R+HdswhNykM6z9W1uwHzTrtsRXr5k7jIEtLyr8W0OlJ4 8L255MbrI7T56Eae80CQyiCCgD9ekfNDM39dkhf4q5hXiWqIEvP1wDRLrKlMritv lZ3X4t9AfuvNj2k2gKnipWE8JBfHCRj0osAMisxaAattpeEnswJmKNSl8yq9dOyN 16sMsLA+sjlw/VFqSlVF+xEYlFLrkzCIhN4i9Y8kdtTi/SkodP6MESzF3OOq4oN2 X1MAL+Ik0knX3sLlchlwe8kSCplxxSsJfTQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudeltddgleegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepffffudejueduveefteefgfevgeeljefhheetheevueetjeeujeekjeejhfdtjeev necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 27 Feb 2023 12:15:56 -0500 (EST) From: Leo Famulari Date: Mon, 27 Feb 2023 12:15:51 -0500 Message-Id: <20230227171552.55069-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")) '()))))