From patchwork Wed Feb 7 11:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Blum X-Patchwork-Id: 197944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2243321dyb; Wed, 7 Feb 2024 05:58:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/j/AMWYwgiWVtFy+rC/MKQZFXLfQK/HP6H0XcswoTseQ0o1RZZZuAALP+sRUfXo6PwlGo X-Received: by 2002:a17:903:2282:b0:1d7:7edb:e9b9 with SMTP id b2-20020a170903228200b001d77edbe9b9mr6280634plh.37.1707314290696; Wed, 07 Feb 2024 05:58:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707314290; cv=pass; d=google.com; s=arc-20160816; b=Sm06CPjTSPbdkZ3p8bxPSYWpmEnddJ7eFW1tNjIm9wL6POzZgzaMmSWd7fnQr7mQM+ yLtgFOUia0hD6WT5IWNiCcf+z5B/5e1RxrvDUZ8C+thKeoucNVmVBBmNFwBE4cf8hfwH kJsGpbIkeNwMslDtR9rpD/5riwAfXyToCv+/JcmkdIyUGzNYEA9ZNmWyQOC/HJ9QGjO2 SlTetgJF/BEkkdmdGshYJiISaOYhYh54kBNFk04JRUpyFpAskvQDyvtmeN4wW5Fm/jVk lOgORvCLeIkFdRXRLbHQUAt7QHsYIgwFLDyee+VIL3LoBRZQC7QKQV/OI0MejpI83CcY jjcg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=6kKATkoha7MJRDxzx6S7MfwCz1BHDb7Q1gZGPDiWFQI=; fh=J3fB5yQxt3vn+UwHiJa8kpCOs5+ZaxbxY4VoOgPBe3o=; b=gb1gZikayv4Ay5u36ItOtNLX2dXT9jupcAPAXg6fMaRcaVANq+M4O7F7yizwpuMgS7 TD+0DMQW3vH9iw2v/1VCGy6zjNPQJLKCI/qVSliEj5TLnODBkyQYbG+snK28ao7XQ84Y ruRA+lwcut88fdCCajPoGPIwfM/Kl+J3C/vnmqY7Tyf2G3g5D4s5lJ9nWxnVIb+68rQQ Y+jELmIBFmIE78LET5edxVq/1bTkHKALg66xhT15vMa8+RcAhAfa6YgtsaltjZ3Rqlsc 5B72W0/TXOQRI3Mhn59Xu2qx5lqHYMW18AsZovqYcaQ7UDtAzyBvuTX3JgA+v9lQrybn 733Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@toblux-com.20230601.gappssmtp.com header.s=20230601 header.b=FGUIhpNz; arc=pass (i=1 dkim=pass dkdomain=toblux-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-56371-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56371-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCWnQHpr9+bfRQnjUiWa7fM4lsOOyF86XgKFdtzdQj4yKMFUBmARcjmQRTVnkFgDkZbEgywgH/JqaRC5RXZAzHpisQPpKA== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id h3-20020a170902748300b001d74823fc1bsi1609833pll.416.2024.02.07.05.58.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 05:58:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56371-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@toblux-com.20230601.gappssmtp.com header.s=20230601 header.b=FGUIhpNz; arc=pass (i=1 dkim=pass dkdomain=toblux-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-56371-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56371-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 88324B25059 for ; Wed, 7 Feb 2024 11:15:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A216A1F61F; Wed, 7 Feb 2024 11:15:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toblux-com.20230601.gappssmtp.com header.i=@toblux-com.20230601.gappssmtp.com header.b="FGUIhpNz" Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFA3717BDD for ; Wed, 7 Feb 2024 11:15:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707304515; cv=none; b=N0zpygWX/mhAIa50H+GjtE8/W03xgubV3wiVfXmhsb8XC50bL1Pr61BI21LE5lH4ScOhP1BH4leUI3K5qC5ChG3wU8jf3yB5bjapVKF7e/tIUB0aqV21sZX99atPAdmenvW//Oz1ao9+MBcKvGHKtMw+J1laH7Fs+rweiZNiIzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707304515; c=relaxed/simple; bh=L4fKG0W9QCT0X2dT1SwcGIU6xeGtXimyzjeiuRERXP8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=A62zBL5piVYFhCK73A8zZ/3uhSXNw1FhfstjqinGCAYzmkm7cNchFp0dcyfSeHOIXa/c07C1GraDEuK40ue0hm4fP6QutY/BQqEhvRvV83sZkwrZ9KgJLT1kG0GzzKPni3IljdXYfbBk6B4w75IfQwH3/0YEH/O8Fdc/p/YtKpA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toblux.com; spf=none smtp.mailfrom=toblux.com; dkim=pass (2048-bit key) header.d=toblux-com.20230601.gappssmtp.com header.i=@toblux-com.20230601.gappssmtp.com header.b=FGUIhpNz; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toblux.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toblux.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a2d7e2e7fe0so96648666b.1 for ; Wed, 07 Feb 2024 03:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toblux-com.20230601.gappssmtp.com; s=20230601; t=1707304512; x=1707909312; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6kKATkoha7MJRDxzx6S7MfwCz1BHDb7Q1gZGPDiWFQI=; b=FGUIhpNzNVu/nIwNrzfb4lP0WrLr7jKVajDTO4IVsrxKxdsco4lR1PyvsMXFwBCCuQ fOj++F5m6qIcOVbJFE0rY1PZwSIlf1d7bUQtXYuQ78uyBQFu4SrMj1ofTsUcJmlY6Tzs uA8Ohm/1XOkFxLKdA/+TrDs0iqfbummucUlQKv6A34nV7yLZCAeOk72ihO7w8P2sIGDv Rj5Kay84gjWmpX6EEO91nefdKhHWwLENRpyUS1dybZUNhBNJTqzzOORBrZHeZ54mpAL3 GBE0IH2ueNBHiRve7lvC7ZYtkJXiGkkXrJG3cTANZ0ZpLWWqqReFXvf64eFXxxwZgi9J 0Vvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707304512; x=1707909312; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6kKATkoha7MJRDxzx6S7MfwCz1BHDb7Q1gZGPDiWFQI=; b=Z4qVE1hUGjYKuh7b/vX6eW/hLNaCdI5DsmG8FTsP6BUhxYzJ0IzxrJDCqFjDMZ98t/ f3LwprK95qxiCnLvEgRVokYDOjOIYmAP0cZk2spwf02ObfoaB6kVNSyeEEu4sKzdqbSk dz96d6Vt/FVmqSrmNwTAGIAJ6S8ZQF059AnUfDFTv2auGnu0yckudZcP68Q02k8Lhn4v rTWoC95dP4JiGvRiWgOXGH78OFo+M2JH35ILwHe+OIryoPqnfsF7riSqdK0g2jBwDXVb jOQwudBjFI15x7HM3OaIQzCMK5lhILzY3EVyOAVLb4LjNsBpBkzc3k82gihs3lTV26qs CEfg== X-Gm-Message-State: AOJu0YyfLkBYu8VVQgtaay0zpF8xnlvYJWCaN4Ss/igENwoXH7mLDsqY G6eZWBSmVUnHwmZKf2llhkiVdLGpmiPMtfOPVoRNr0+l35MASVoQzbd5GfwYxgR+jSerLWbubuo baqY= X-Received: by 2002:a17:906:168e:b0:a38:1a75:787d with SMTP id s14-20020a170906168e00b00a381a75787dmr5440517ejd.24.1707304512048; Wed, 07 Feb 2024 03:15:12 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXfcOTVEdJD27+JGCOb6HJiNpAh4UIv/nTV2Whv2SEOhsaFVOroeAlbiT9JJWY5qvRb95M97X/OENJI+G2eAIN2E4eX4SHZUgotJpzkIpgRFW1y6Jwh9Are7yqozY+7dWUvVAqvANkHOOM13q6SFqrbgtyZWv50uGzpNw== Received: from debian.fritz.box (aftr-82-135-80-180.dynamic.mnet-online.de. [82.135.80.180]) by smtp.gmail.com with ESMTPSA id ty13-20020a170907c70d00b00a338fedb9ebsm650975ejc.54.2024.02.07.03.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 03:15:11 -0800 (PST) From: Thorsten Blum To: Jonathan Corbet , Mauro Carvalho Chehab Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [PATCH] docs: scripts: sphinx-pre-install: Fix building docs with pyyaml package Date: Wed, 7 Feb 2024 12:12:37 +0100 Message-Id: <20240207111236.7242-1-thorsten.blum@toblux.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790248789450069232 X-GMAIL-MSGID: 1790248789450069232 The Python module pyyaml is required to build the docs, but it is only listed in Documentation/sphinx/requirements.txt and is therefore missing when Sphinx is installed as a package and not via pip/pypi. Add pyyaml as an optional package for Debian- and Red Hat-based distros to fix building the docs if you prefer to install Sphinx as a package. Signed-off-by: Thorsten Blum --- scripts/sphinx-pre-install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index 25aefbb35377..7905beab3359 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -361,6 +361,7 @@ sub give_debian_hints() { my %map = ( "python-sphinx" => "python3-sphinx", + "pyyaml" => "python3-yaml", "ensurepip" => "python3-venv", "virtualenv" => "virtualenv", "dot" => "graphviz", @@ -395,6 +396,7 @@ sub give_redhat_hints() { my %map = ( "python-sphinx" => "python3-sphinx", + "pyyaml" => "python3-pyyaml", "virtualenv" => "python3-virtualenv", "dot" => "graphviz", "convert" => "ImageMagick", @@ -955,6 +957,7 @@ sub check_needs() check_program("gcc", 0); check_program("dot", 1); check_program("convert", 1); + check_python_module("pyyaml", 1); # Extra PDF files - should use 2 for is_optional check_program("xelatex", 2) if ($pdf);