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 4PIBKyHNemOu9QAAbAwnHQ (envelope-from ) for ; Mon, 21 Nov 2022 01:58:09 +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 gF3eKiHNemNmVAEAauVa8A (envelope-from ) for ; Mon, 21 Nov 2022 01:58:09 +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 F04D933548 for ; Mon, 21 Nov 2022 01:58:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owv8N-0006ss-Je; Sun, 20 Nov 2022 19:58:03 -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 1owv8M-0006si-C1 for guix-patches@gnu.org; Sun, 20 Nov 2022 19:58: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 1owv8M-000337-3v for guix-patches@gnu.org; Sun, 20 Nov 2022 19:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owv8M-0001Yp-06 for guix-patches@gnu.org; Sun, 20 Nov 2022 19:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59313] [PATCH] gnu: linux-libre: Enable building html and info doc. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Nov 2022 00:58: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: Christopher Baines Cc: 59313@debbugs.gnu.org Received: via spool by 59313-submit@debbugs.gnu.org id=B59313.16689922495958 (code B ref 59313); Mon, 21 Nov 2022 00:58:01 +0000 Received: (at 59313) by debbugs.gnu.org; 21 Nov 2022 00:57:29 +0000 Received: from localhost ([127.0.0.1]:44931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owv7p-0001Y2-CC for submit@debbugs.gnu.org; Sun, 20 Nov 2022 19:57:29 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:38479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owv7m-0001Xm-EU for 59313@debbugs.gnu.org; Sun, 20 Nov 2022 19:57:27 -0500 Received: by mail-qt1-f179.google.com with SMTP id z6so6477452qtv.5 for <59313@debbugs.gnu.org>; Sun, 20 Nov 2022 16:57:26 -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=hRclns4+MpTToMF2U5ViL+XcRWVvrhiXG/w6lfaLahg=; b=JOQrTdvHgrKcGD8Aq3FjvVfe4M07w0SbeGSg+OsvOp7mXoQP5qCvS+pC0GlhC2HKSx lytZKo+DvJ3eNt37M54CGz+y/Q7YdjxVdADZdATtepLmbHNSWeTzc63Db5onbMQFkKWA uaEggZgwATnTj4qEudp6n4+FzztB8MuZQ067Ssv9Yx8iWDi0cNfYraks1bqeFtdsAxCQ 2WR1o/Evf47KmDw6k/Zz0/k5o0++sNOLRL+9jesPrJnPqUopPEvDUAqtT/6Jjc2wsHIp 5kzxmRrKMuLHt6FALCfk0ezRB/RHhw8nLwdBRjtwAFBxGLXf8MYZDbYcG3cZX6S8xgXy DdTA== 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=hRclns4+MpTToMF2U5ViL+XcRWVvrhiXG/w6lfaLahg=; b=bwoNE508scztal5ZG/kCqrUm71egvOSoxwMyrpel/tSG2Gi6gUaXlkct7+7TbjFQpW Ar+488HYlUC/tJnD/h56yK7Rfqp9OSpv03eqW0LwRI+XpzyaZbCd6Fjc25SqhFsbhQ/y LrfS7yTVQ1Ravz6PGV+z//lXci2/FhhCemHRxlMNoNB1n2hDBVEhLyPhFQaqmml0dSFJ E04vpFMMG3h+rFh3M9TpY9oCCrL7IK+4lNaGNY4If7Nd1y5wWbGCPz6ohrGsKv6f0JJW l8+QpMV7S7k1vD2FHPXjMbHsas+XQj3x1J4PJx8i4U/tAMnM1JCKRfs+W0zvHVDd56Cb 9ekg== X-Gm-Message-State: ANoB5pnMsZ8PnjIRUbJfx10cSbaYFvidAWOId+iQyfxuYvmmjqhL7Qrh 7B5MccSUSLBa2LLecx06iC3lS04EB6s= X-Google-Smtp-Source: AA0mqf7Dlin1o0jMYJ2/Zcgl5tx8d2F2ppDo8bKVvN0rpusZuva49y3eYcV/Sn92BLTRbMwD2gGtLg== X-Received: by 2002:a05:622a:5c8e:b0:3a5:5c9e:d453 with SMTP id ge14-20020a05622a5c8e00b003a55c9ed453mr16068455qtb.403.1668992240561; Sun, 20 Nov 2022 16:57:20 -0800 (PST) Received: from hurd (dsl-141-193.b2b2c.ca. [66.158.141.193]) by smtp.gmail.com with ESMTPSA id gc7-20020a05622a59c700b0035ce8965045sm5967824qtb.42.2022.11.20.16.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 16:57:19 -0800 (PST) From: Maxim Cournoyer References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> <87pmdhx3lo.fsf@cbaines.net> Date: Sun, 20 Nov 2022 19:57:18 -0500 In-Reply-To: <87pmdhx3lo.fsf@cbaines.net> (Christopher Baines's message of "Sun, 20 Nov 2022 11:31:54 +0000") Message-ID: <878rk52kgh.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: 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=1668992289; 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=BltdbfiOKufT3CPJxhPvAnMebFpoaXI3+nnpoXXOO40=; b=lp2ofY86NhPD/sJ/3cbUBoXkbT1aU22L7BRwS0XJrJE4j7TrSZTExGJSUU50alI00r7b7T LjUTx63zoCnnEbi/N8oFwSkO74ohkRUJilE/ZPpBROS0WNu+o8IlOFWxQ8p777Tc+AKXI2 uY/oLpzTZuvAZKUihVDD/uC9Oz5qjlDZPD5ETh70fRJoAR6jRWF7EQ8Hsn7W8O6sxWr7x2 Uys95G51BSw+L5XXP4wdofe+zi97zGfcalIIwP6erQ22oeaTRs540s5XrWg07fQk/PIoJ6 yOvLZQ6ms9lL11vbgR+i/GczEe33freRbodZgIBlzhft6spKTB/72WwjObqXww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668992289; a=rsa-sha256; cv=none; b=JFG+YlusyJ6e1NnUV/7NsBRT9csSv3hlmW6AUnAgJlV0iOvsIhrWbiW0ao9jDfTnyR1Rxb lJc/UvjgwGvbd1dZKpg7F5rmCq6gY1a5yW3NYZrDNCrcgwzV9KL9uY4siFfrddRXVB8QE1 jT2NGbeblPeQDWOIcucjuE0tKev436ZZKtuu0lGdz7YtIUH5oEfDR4UJiTqf9AjlZNVmIC yuuTA/dKNM5cKaQJlpuAyMUMICTaFnxvHEGTtJq1qaYipJ6gaKXlbDwZrUe9HVDGIM54c3 +Qk5ScthhIfXTeReX/GdbB+IHVJLTJLCC6Ej4wmkSY3iZPF1P1T3Ei0482PSVQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=JOQrTdvH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 5.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=JOQrTdvH; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: F04D933548 X-Spam-Score: 5.49 X-Migadu-Scanner: scn0.migadu.com X-TUID: 97nx/pFt1EPs Hi, Christopher Baines writes: > Maxim Cournoyer writes: > >> * 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) >> (linux-libre-5.4-source, linux-libre-4.19-source) >> (linux-libre-4.9-source): Apply above patch. >> * gnu/packages/linux.scm (make-linux-libre): Add new patch in the default >> patches used. Add a BUILD-DOC? argument. >> (make-linux-libre*): Add a BUILD-DOC? argument. >> [outputs]: New field. >> [phases]: Conditionally add the build-doc and install-doc phases. >> [native-inputs]: Conditionally add graphviz, python, python-sphinx, >> python-sphinx-rtd-theme, texinfo and which. >> --- >> gnu/local.mk | 3 +- >> gnu/packages/linux.scm | 280 ++++++++++-------- >> .../patches/linux-libre-infodocs-target.patch | 88 ++++++ >> 3 files changed, 253 insertions(+), 118 deletions(-) >> create mode 100644 gnu/packages/patches/linux-libre-infodocs-target.patch > > Hi, > > Looking at https://qa.guix.gnu.org/issue/59313 this seems to break the > build of linux-libre@5.10.154 on x86_64-linux and > linux-libre-arm64-generic@5.10.154 on aarch64-linux, plus maybe some > other things. Thanks for pointing that! The data service is proving useful again! :-). I've made the following changes, which I'll send as v2 shortly: --8<---------------cut here---------------start------------->8--- 1 file changed, 26 insertions(+), 17 deletions(-) gnu/packages/linux.scm | 43 ++++++++++++++++++++++++++----------------- modified gnu/packages/linux.scm @@ -108,8 +108,9 @@ (define-module (gnu packages linux) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) - #:use-module (gnu packages flex) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) @@ -516,25 +517,21 @@ (define-public linux-libre-5.4-source %linux-libre-arm-export-__sync_icache_dcache-patch ;; Pinebook Pro patch from linux-next, ;; can be dropped for linux-libre 5.7 - (search-patches - "linux-libre-support-for-Pinebook-Pro.patch" - "linux-libre-infodocs-target.patch")))) + (search-patch + "linux-libre-support-for-Pinebook-Pro.patch")))) (define-public linux-libre-4.19-source (source-with-patches linux-libre-4.19-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-4.14-source (source-with-patches linux-libre-4.14-pristine-source - (list %boot-logo-patch - (search-patch "linux-libre-infodocs-target.patch")))) + (list %boot-logo-patch))) (define-public linux-libre-4.9-source (source-with-patches linux-libre-4.9-pristine-source - (list %boot-logo-patch - (search-patch "linux-libre-infodocs-target.patch")))) + (list %boot-logo-patch))) ;;; @@ -767,6 +764,11 @@ (define (config->string options) ;;; Kernel package utilities. ;;; +(define (doc-supported? version) + ;; Versions older than 5.10 have different enough build scripts that the + ;; infodocs patch doesn't apply. + (version>=? version "5.10")) + (define* (make-linux-libre version gnu-revision hash-string supported-systems #:key (extra-version #f) @@ -775,11 +777,13 @@ (define* (make-linux-libre version gnu-revision hash-string supported-systems (configuration-file #f) (defconfig "defconfig") (extra-options %default-extra-linux-options) + (build-doc? (doc-supported? version)) (patches - (list %boot-logo-patch - (search-patch - "linux-libre-infodocs-target.patch"))) - (build-doc? #t)) + `(,%boot-logo-patch + ,@(if build-doc? + (list (search-patch + "linux-libre-infodocs-target.patch")) + '())))) (make-linux-libre* version gnu-revision (origin (method url-fetch) @@ -801,7 +805,9 @@ (define* (make-linux-libre* version gnu-revision source supported-systems (configuration-file #f) (defconfig "defconfig") (extra-options %default-extra-linux-options) - (build-doc? #t)) + (build-doc? (doc-supported? version))) + (when (and build-doc? (not (doc-supported? version))) + (error "unsupported 'build-doc?' for kernels <5.10")) (package (name (if extra-version (string-append "linux-libre-" extra-version) @@ -948,8 +954,11 @@ (define* (make-linux-libre* version gnu-revision source supported-systems ;; For generating the documentation. ,@(if build-doc? - `(("graphviz" ,graphviz) - ("python" ,python) + ;; TODO: remove fontconfig after the 5.10 kernel is dropped. + ;; Also replace python-wrapper by python at that time. + `(("fontconfig" ,fontconfig) + ("graphviz" ,graphviz) + ("python" ,python-wrapper) ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("texinfo" ,texinfo) --8<---------------cut here---------------end--------------->8--- Any kernel older than 5.10 is now untouched. -- Thanks, Maxim