From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ANzgGnFwfGMSjAAAbAwnHQ (envelope-from ) for ; Tue, 22 Nov 2022 07:47:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sLTGGnFwfGNWeQAAauVa8A (envelope-from ) for ; Tue, 22 Nov 2022 07:47:13 +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 9F5BE1F886 for ; Tue, 22 Nov 2022 07:47:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxN3h-0008KU-IM; Tue, 22 Nov 2022 01:47: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 1oxN3e-0008J5-If for guix-patches@gnu.org; Tue, 22 Nov 2022 01:47:04 -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 1oxN3e-0006n4-3I for guix-patches@gnu.org; Tue, 22 Nov 2022 01:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oxN3d-0006ad-Mm for guix-patches@gnu.org; Tue, 22 Nov 2022 01:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59313] [PATCH] gnu: linux-libre: Enable building html and info doc. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Nov 2022 06:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 59313@debbugs.gnu.org, mail@cbaines.net Received: via spool by 59313-submit@debbugs.gnu.org id=B59313.166909959025289 (code B ref 59313); Tue, 22 Nov 2022 06:47:01 +0000 Received: (at 59313) by debbugs.gnu.org; 22 Nov 2022 06:46:30 +0000 Received: from localhost ([127.0.0.1]:49488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxN38-0006Zo-AX for submit@debbugs.gnu.org; Tue, 22 Nov 2022 01:46:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxN33-0006ZX-As for 59313@debbugs.gnu.org; Tue, 22 Nov 2022 01:46:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxN2x-0005fj-Ko; Tue, 22 Nov 2022 01:46:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=60BQnbksw5vXEh8sy+eTRWHu9egc4ENO7pM5xPqvhB8=; b=Awv3c2FeVRYBeE3yVa1C q3ztYzt7crNriuXiKz3RKcL0snYHWcj0CAcPEVbGWyFipdR3IA/FvBE9M/jITC2XP5etotzzOmjAx A7NLkUQPzEkhe44OCL7bWvuegGjDxqwh4bd0YZpRFRcwV9AmBz3dUUMfVd0mdCGiPyvz8q5z8S/o3 Y8fkJVZp6TM2lmbgj5e970Ry70Fud8/KJoqcQx72NxcveASA5uxhZ37skgvGPZkOB9/PVwZfa8Aix 5+dxy4v09+/EBST0jyrvaqs49V364jBQ1ccM/YnLhQxjP2ZUPlobb8f7x3EzQtYEXqPTbiRWfCQhI Sj4rNtUgZq3lvg==; Received: from [89.207.171.76] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxN2x-0004Tg-2h; Tue, 22 Nov 2022 01:46:19 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87pmdhx3lo.fsf@cbaines.net> <20221121010324.16069-1-maxim.cournoyer@gmail.com> Date: Tue, 22 Nov 2022 07:46:14 +0100 In-Reply-To: <20221121010324.16069-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 20 Nov 2022 20:03:24 -0500") Message-ID: <877cznjxl5.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669099633; 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: content-transfer-encoding:content-transfer-encoding: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=60BQnbksw5vXEh8sy+eTRWHu9egc4ENO7pM5xPqvhB8=; b=SgrOjBqwmz7M1pjvWhIrEboTZMg3n9GsVak/QsXj7DqP0LEIZmXKKuA2XQ3B7RoW1X3xOl hi3gdh2loGtd6KCI/ik69Lv7Lqd7Rc3YFsh7ybIfvb/HPU3Z2i58yp/xcQIfJTffro8wdp DXsPUWWV9Kz+syX4RWRKMwORSpxHKQD44WyD3+l02k6Y4kgpzqAVb0vYXq9u3eF9MZAz2h rVYbL5HVx7/HSO3xAJz6JFmTE2KWrDAHoxdM39OiwwzZjo0VEFUCvvZXtuI2CR6tkuRpLb D2llpArt90vnrBCGA3c7olhn5XJQ+nnM44SDvi3uLc0LAbtJ8VWvA7m6DJKchg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669099633; a=rsa-sha256; cv=none; b=pbgA2v6cdjjP5DlgoNev7bCVbfmiLkvbvo5TYQBEPj7Uz/ebQlWuduvR/nMuxXsCaHe6wm otEVbQC3v5hzAe1JPtONBT9Zgrc/wx2JfK+KrrvqKOU995v0ILGcRMlTxuK+EcGhH0wST6 Ugl8kxjnIk2HmoWm7lmj2hsjDpjJv8nHp/pic8lifJJyWDjN+2i7WtwXoG+vLtqoyVwWD5 QMsNFOZpAAy0BZ4rQTpIZYv+qbX/SfuyO9zeMDIjILMX1pePKhJUdn9tZsfCem65TzYImI DDBbgVsXxgg5GLmTWvTG/OjPrFTMpQXekDMHXWqv2JWYDcYSRtX+yxJEb6lEDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Awv3c2Fe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Awv3c2Fe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9F5BE1F886 X-Spam-Score: -2.40 X-Migadu-Scanner: scn1.migadu.com X-TUID: tnTPo9qZ0Xou Hi Maxim, Maxim Cournoyer skribis: > * gnu/packages/patches/linux-libre-infodocs-target.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > (linux-libre-6.0-source, linux-libre-5.15-source) > (linux-libre-5.10-source): Apply above patch. > (doc-supported?): Looks like these 3 lines are misplaced. > * gnu/packages/linux.scm (make-linux-libre) [DOC-SUPPORTED?]: Add new pat= ch in > the default patches used. Add a BUILD-DOC? argument. > (make-linux-libre*): Add a BUILD-DOC? argument. Validate BUILD-DOC? for > supported VERSION. > [outputs]: New field. > [phases]: Conditionally add the build-doc and install-doc phases. Nitpick: I=E2=80=99d write =E2=80=9C[arguments]=E2=80=9D rather than =E2=80= =9C[phases]=E2=80=9D. > [native-inputs]: Conditionally add fontconfig, graphviz, python-wrapper, > python-sphinx, python-sphinx-rtd-theme, texinfo and which. [...] > + #~((add-before 'configure 'build-doc > + (lambda _ > + (substitute* "Documentation/Makefile" > + ;; Remove problematic environment check script. > + ((".*scripts/sphinx-pre-install.*") "")) > + (invoke "make" "infodocs" "htmldocs"))) > + (add-after 'build-doc 'install-doc > + (lambda _ > + (with-directory-excursion "Documentation/output" > + (let ((docdir (string-append > + #$output:doc > + "/share/doc/linux-libre/html"))) > + (mkdir-p docdir) > + (copy-recursively "html" docdir)) > + (invoke "make" "-C" "texinfo" "install-info" > + (string-append "infodir=3D" #$output > + "/share/info")))))) I would keep only Info documentation, which is much smaller than HTML. This is what we do for every packages where we have that possibility. Apart from that it looks great to me, thanks! Ludo=E2=80=99.