From patchwork Sat Mar 4 00:35:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 47597 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 0DA6B16D28; Sat, 4 Mar 2023 00:36:21 +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=unavailable 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 017C916B79 for ; Sat, 4 Mar 2023 00:36:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYFsa-0007rT-8L; Fri, 03 Mar 2023 19:36:04 -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 1pYFsY-0007qu-P0 for guix-patches@gnu.org; Fri, 03 Mar 2023 19:36:02 -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 1pYFsY-0007Bv-Fc for guix-patches@gnu.org; Fri, 03 Mar 2023 19:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYFsY-000611-9m for guix-patches@gnu.org; Fri, 03 Mar 2023 19:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61947] [PATCH 1/2] gnu: Fix kernel source infodoc patching for linux-libre >= 6.2. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 00:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 61947@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61947-submit@debbugs.gnu.org id=B61947.167789013023072 (code B ref 61947); Sat, 04 Mar 2023 00:36:02 +0000 Received: (at 61947) by debbugs.gnu.org; 4 Mar 2023 00:35:30 +0000 Received: from localhost ([127.0.0.1]:34273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYFs2-000604-3I for submit@debbugs.gnu.org; Fri, 03 Mar 2023 19:35:30 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:38591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYFrz-0005zq-TI for 61947@debbugs.gnu.org; Fri, 03 Mar 2023 19:35:28 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 3CFBA32009BA; Fri, 3 Mar 2023 19:35:22 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 03 Mar 2023 19:35:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc: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=1677890121; x=1677976521; bh=12P0fbwBRVxaVSW3hjvAiokV/8h4uF2NsolenyGYY5g=; b=p+0DtLtK7wEI AcQ4W1P8kf9DgkiQ2di8493PuTwcQfA9XKS+WggcYq4Wj+mejvWXSKAjfnJrx+qp iqRsUm0dDTuYsAXT6LBcEZ9KCPqF8Ve5Iz6a1ti/01FCbAzYMFsm/+uPFT2uYot5 mUCOS0rNQUz/uIc8WLclcI9YL0nQgG4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=fm1; t=1677890121; x=1677976521; bh=12P0fbwBRVxaV SW3hjvAiokV/8h4uF2NsolenyGYY5g=; b=izawpzWqCobW70BFjNbBNbD2o3G9T hd2Py8klICo0qasPXzcEI28XQMfN8AFS653fGkGawp9f6hK4D2IBbk0SKNdAHlVG CrDJfMNG/gdHzXWa7VG3t8K9v0phtq40iT5T9xng/6G/yfV9JnNvCc/BgCBprTJN S39VTYw9mMMIjobuwEmw2+BDQz4ImMyHDCuF0XOTVHfWQ+EHpQKnFKHPe+hkeUAo BPLL7Oe9KuP/TokS2PaRkEFNpPddqjjBs9/+OmN8tt0uvcPfWnt/DI4gFymD6y60 ScNCbi1KqUc9lhYLAdgz9OrHKMjJ7QHZHslr9WEbncvbFrc+k11R8WwHw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddttddgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepffffudejueduveefteefgfevgeeljefhheetheevueetjeeujeekjeejhfdtjeev necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 3 Mar 2023 19:35:21 -0500 (EST) From: Leo Famulari Date: Fri, 3 Mar 2023 19:35:16 -0500 Message-Id: <20230304003517.15072-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 8e01d505ab..be14869f70 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")) '()))))