From patchwork Thu Oct 15 21:53:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 271169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11991C433E7 for ; Thu, 15 Oct 2020 21:55:31 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2B0D52076A for ; Thu, 15 Oct 2020 21:55:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hUy24E0U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B0D52076A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTBDd-0002Ru-23 for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 17:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTBCH-0000ln-Hj for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:05 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:41996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTBCF-0005H6-V1 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:05 -0400 Received: by mail-pl1-x635.google.com with SMTP id c6so103062plr.9 for ; Thu, 15 Oct 2020 14:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gD6WMWYQ9CIQ4TmbgB/h0Tt9F/nzYRkxmSRyeiKZIXA=; b=hUy24E0UA9dVu7MJfrgVjWpTNElEKjUwPkZgVH0Cfblvtt7mYI7a8QSEGfrcE5mT7Q Ke7pj0Uvgy93FYR/mUhrUXtXDMgowhS+97ZfMwmrXfv69+uuSnZo9TOqeKNu7QPbC/6L dSdneeYXdnfPPnnZLT6+B7Wb4aPDk2l1r2ZHRZumo48qYEO9wpv6+PeuBSqeoo4bGN+I O659ZGEnhGbarXf0Fx1HRPORzIIdQkOGVU7uoho4If5O2lLPAsO+HHz87j8DHinKciUf bR0R0W1eJ5vs9wtjWJlSlHqTRmtcbsjvc0fHnx33WOjO8zzD1pyXXFqwGtq+JQqiMR/H EFfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gD6WMWYQ9CIQ4TmbgB/h0Tt9F/nzYRkxmSRyeiKZIXA=; b=GJF/dNN4OVZBGI8+H6cnjP9nq1rZ7ZnM0WI7qRD3UIPY2Pn6cmBFX2uzyT//8SC1po +R3YBwJN1//avg1JmjnPUxxw55s2WRSea5GPGtKcX9wX7jcDlreMbWGQ/VuVuHmFb8lb i2M2pV9CYxOYYs+9T4dqwMS8KGTGGGnKNIJ15jchEmtiAR5Euq4e5K4RSTGYRsdkFpV9 lsxJ0zC1DU0spGoAq1vOsaMgKgwlpeRlK6FN6ykK5tRkBVhexXL80/R3jh7QC803d/YX LO6pjVEgsugHvpwjVSyI5oXBnWIPaHPeLKbnGuKpSxHBAhuW4Mf7i3OzhEIZMVS9HGAX zjIw== X-Gm-Message-State: AOAM531NoEctcO8SYlBk+qKEdF9PsJyaQeCUPJHuXK84xjkRShMXzSUZ x/z6hDK1Aw2upnlK2F21Qhz+KoERyzrML5Y1 X-Google-Smtp-Source: ABdhPJycIg4IRSBaC77DCFZrTxSHjv3kPn0Z7D7hteZmTIPDsbUK1eUkVyMFMNQ/XItRHh3NJkPXug== X-Received: by 2002:a17:90a:3:: with SMTP id 3mr703818pja.184.1602798841957; Thu, 15 Oct 2020 14:54:01 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id f66sm252856pfa.59.2020.10.15.14.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 14:54:01 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v3 1/4] docs: Fixes build docs on msys2/mingw Date: Fri, 16 Oct 2020 05:53:42 +0800 Message-Id: <20201015215345.173-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015215345.173-1-luoyonggang@gmail.com> References: <20201015215345.173-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x635.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" meson didn't support running ../scripts/kernel-do directly Signed-off-by: Yonggang Luo --- docs/conf.py | 2 +- docs/sphinx/kerneldoc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 00e1b750e2..e584f68393 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -241,7 +241,7 @@ texinfo_documents = [ # We use paths starting from qemu_docdir here so that you can run # sphinx-build from anywhere and the kerneldoc extension can still # find everything. -kerneldoc_bin = os.path.join(qemu_docdir, '../scripts/kernel-doc') +kerneldoc_bin = ['perl', os.path.join(qemu_docdir, '../scripts/kernel-doc')] kerneldoc_srctree = os.path.join(qemu_docdir, '..') hxtool_srctree = os.path.join(qemu_docdir, '..') qapidoc_srctree = os.path.join(qemu_docdir, '..') diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py index 3e87940206..3ac277d162 100644 --- a/docs/sphinx/kerneldoc.py +++ b/docs/sphinx/kerneldoc.py @@ -67,7 +67,7 @@ class KernelDocDirective(Directive): def run(self): env = self.state.document.settings.env - cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno'] + cmd = env.config.kerneldoc_bin + ['-rst', '-enable-lineno'] filename = env.config.kerneldoc_srctree + '/' + self.arguments[0] export_file_patterns = []