From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aFymMACz/GNkjAAAbAwnHQ (envelope-from ) for ; Mon, 27 Feb 2023 14:41:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kHmnMACz/GPsfAAAauVa8A (envelope-from ) for ; Mon, 27 Feb 2023 14:41:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A19023554E for ; Mon, 27 Feb 2023 14:41:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWdkX-0003D3-Oq; Mon, 27 Feb 2023 08:41: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 1pWdkU-00039q-M5 for bug-guix@gnu.org; Mon, 27 Feb 2023 08:41: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 1pWdkU-0002Jn-ET for bug-guix@gnu.org; Mon, 27 Feb 2023 08:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWdkU-0000uk-9b for bug-guix@gnu.org; Mon, 27 Feb 2023 08:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61798: infodoc patch doesn't apply to linux 6.2 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 27 Feb 2023 13:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61798 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Leo Famulari Cc: 61798@debbugs.gnu.org Received: via spool by 61798-submit@debbugs.gnu.org id=B61798.16775052453478 (code B ref 61798); Mon, 27 Feb 2023 13:41:02 +0000 Received: (at 61798) by debbugs.gnu.org; 27 Feb 2023 13:40:45 +0000 Received: from localhost ([127.0.0.1]:46388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWdkD-0000u2-4a for submit@debbugs.gnu.org; Mon, 27 Feb 2023 08:40:45 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:43617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWdkB-0000tm-Aq for 61798@debbugs.gnu.org; Mon, 27 Feb 2023 08:40:44 -0500 Received: by mail-qt1-f176.google.com with SMTP id cf14so6526821qtb.10 for <61798@debbugs.gnu.org>; Mon, 27 Feb 2023 05:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jvvIcmCKBQ/Lul42K0qvSrXsCg7HeeRXMXjlKdUZmVg=; b=X6WcXtB5cmncjB1adTE6g8eqrm6P3U873TvKtsrf0NvmLhORd7Grp3yJkt/YOxJGn3 yqk7zMiDNVJcgEdPbV8385tfw2urpD64KiEP8lGr+4oRhtODlfWhd9E90WKPXltrJ7Cw gjM8+hTVx8FldEKcH9el7EHQWjGYanFnWYnlBzzsONZZczsx2Ra8YLVRlUyuqArBvn/e 6jPBLeEJWgPLaHK4Q0AWfsPe/bAXvPZhCrJ9mocHx17mUfFJIfBufssH1P6coyuhQw6b e+49rtAs1TZ2X69q4Z+i2CAl+hsKTpJQhCFwNk7vZWvx91KmVmPk2h5Y+rPwyIrkBrbL B8vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jvvIcmCKBQ/Lul42K0qvSrXsCg7HeeRXMXjlKdUZmVg=; b=1uT6SsotHm7Jk45a98E4/4ATXYtwvox4q8PF1jJQWT2gCJ+gUqAZQrw+2IFhCrb9QY UBOHJoAF/L4fRhEGs/Q/f5iuls+iIOglnVHrZao3JbmdD5v4xQCgzwH6P1Iem7ygROv0 X4t3anRjetB9rVqRENsrXOU1GhUwJv5u37VDUoW5qxSJ7rwBSzPHrAP/sPjVfFU12bYQ qpR9NUgsyy+pIyTDsBxcwxe4cLQYwZmXJuBLxXqUDUMFfB5EwEqURaB7vrpWSVMN4p9N 2s2LV3wUiaKLkzQ05Wmww/2IDkTyRIzn4q7O+tJBiPUF4mnc0RGOaUsqkEl1E2Z05H34 v6mg== X-Gm-Message-State: AO0yUKVfbvyFXsD+jNwMdwzjUFpVAUxoGKpqzQ8g12CjwGCMGzcx1pn2 jtZw235LWNpdqe3vAi2IKn9Aq/4bzgESFg== X-Google-Smtp-Source: AK7set8npiW7syRzYfiFMm44USrnNt/Z+f12TvaFhjYJjDUyiPHMdr8Lo76M1pT/wM2CqR3u1kqThw== X-Received: by 2002:ac8:7d49:0:b0:3b8:6d3a:5ed4 with SMTP id h9-20020ac87d49000000b003b86d3a5ed4mr42791237qtb.67.1677505237493; Mon, 27 Feb 2023 05:40:37 -0800 (PST) Received: from hurd (dsl-156-86.b2b2c.ca. [66.158.156.86]) by smtp.gmail.com with ESMTPSA id r9-20020ac84249000000b003b643951117sm4631228qtm.38.2023.02.27.05.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 05:40:37 -0800 (PST) From: Maxim Cournoyer References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> <87cz5xdphq.fsf@gmail.com> Date: Mon, 27 Feb 2023 08:40:36 -0500 In-Reply-To: (Leo Famulari's message of "Sun, 26 Feb 2023 12:38:29 -0500") Message-ID: <87o7pfkyzv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=X6WcXtB5; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677505280; a=rsa-sha256; cv=none; b=iijn9VrazIzVtSy16WreXtXnjAy+pCoDQjdkmULFTj6oHe9xC3FNPu1eHo5oZZ5kIPOpjH uLaf5DswSNZCTSyM7UtrNcm70NfeMJ9VjoQ26hXCK3jqYFZc+akDYmuROHkeICKLBZeqEW OJ4/FQqJVHq4taLD6/ZP1P9SnVeq8uOPbMk1ewGBMOehPJu0fXLUc6Hptx4lKH1bh+pSvl P4YuxUqm7LGF07EFvV2hFTzH/P6mPePNjA5IY1UYyvb/kB/vrximoaWZHqHeKX3Htwr/XD zbJNacLo+0INIxLg9GAlG7F1/EoTPn+J0GFPBGJBNezlkBFR4Vzm9S0ZHPzcfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677505280; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=jvvIcmCKBQ/Lul42K0qvSrXsCg7HeeRXMXjlKdUZmVg=; b=eq6PP9rx0YjaOJ+XDg5WXvTqsNBPSoIpGFLdJz5ftglg2EMZyCX/BMB2nvUAL5Rd1kiPu7 VVXL5d5jNPFb7fXSGUU5oZq0I91AjYRG5orcIUjtzRVJArXxfyBvOWSCXS0IED/C/4bXL1 51HGresw9+fvqa/i5azvo8hWTD9TxCDrcEUzQW7QJNa+jMx63l8ANOhHtzRCrCqbcx2f+H 4P4ajDJQZgftT/5ReAm8t/LfQvUga55dqECmdcdUK2KMNNJJOe7HJVFgLdC1QwYwCO/2YG fberYoffJn5mjP2NMBtzOLXKEOU6BBdNFADoi8xwdt96WuMj6otHfT2NkxPbqA== X-Migadu-Queue-Id: A19023554E Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=X6WcXtB5; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.59 X-Spam-Score: -0.59 X-TUID: 5mSHcSkmZQBK Hi Leo, Leo Famulari writes: > On Sat, Feb 25, 2023 at 11:23:13PM -0500, Maxim Cournoyer wrote: >> It's indeed been applied upstream. Can't we just drop our local version >> of it? > > Do I need to set the 'doc-supported?' value somehow for particular > kernel versions? It would be helpful for me if you could try it, if this > stuff is still fresh in your mind, since you implemented it. This should allow you to proceed as usual: --8<---------------cut here---------------start------------->8--- 1 file changed, 5 insertions(+), 5 deletions(-) gnu/packages/linux.scm | 10 +++++----- modified gnu/packages/linux.scm @@ -620,8 +620,7 @@ (define (source-with-patches source patches) (define-public linux-libre-6.2-source (source-with-patches linux-libre-6.2-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch "linux-libre-infodocs-target.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-6.1-source (source-with-patches linux-libre-6.1-pristine-source @@ -889,10 +888,11 @@ (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 @@ -905,7 +905,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")) '())))) --8<---------------cut here---------------end--------------->8--- -- Thanks, Maxim