From patchwork Wed Mar 4 02:26:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: taoyunxiang X-Patchwork-Id: 1248740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48XHpR52hCz9sNg for ; Wed, 4 Mar 2020 13:27:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 30DD32043A; Wed, 4 Mar 2020 02:27:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w7dIsxihGUjE; Wed, 4 Mar 2020 02:27:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 6630220422; Wed, 4 Mar 2020 02:27:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5CA92C1AE2; Wed, 4 Mar 2020 02:27:19 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id BA846C013E for ; Wed, 4 Mar 2020 02:27:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A436C8527F for ; Wed, 4 Mar 2020 02:27:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vccq4WCKxBiS for ; Wed, 4 Mar 2020 02:27:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from cmccmta1.chinamobile.com (cmccmta1.chinamobile.com [221.176.66.79]) by whitealder.osuosl.org (Postfix) with ESMTP id 7842384F4F for ; Wed, 4 Mar 2020 02:27:14 +0000 (UTC) Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25e5f11e304a-d8c44; Wed, 04 Mar 2020 10:26:43 +0800 (CST) X-RM-TRANSID: 2ee25e5f11e304a-d8c44 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from yun.localdomain (unknown[112.25.154.146]) by rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id 2ee25e5f11e208d-46cf4; Wed, 04 Mar 2020 10:26:43 +0800 (CST) X-RM-TRANSID: 2ee25e5f11e208d-46cf4 From: Tao YunXiang To: ovs-dev@openvswitch.org Date: Wed, 4 Mar 2020 10:26:24 +0800 Message-Id: <20200304022624.11790-1-taoyunxiang@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <9> References: <9> Cc: Liu Chang , Rong Yin , Tao YunXiang Subject: [ovs-dev] [PATCH ovn] rhel: Fix make rpm-fedora by unified sphinx X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" If OVS>=2.13, we need '/usr/bin/sphinx-build-3' to bulid[0]. So it could be better to unify the version of "sphinx-build" between OVS and OVN, to avoid erros during make. [0] https://github.com/openvswitch/ovs/blob/master/rhel/openvswitch-fedora.spec.in#L65 Co-authored-by: Liu Chang Co-authored-by: Rong Yin Signed-off-by: Tao YunXiang Signed-off-by: Liu Chang Signed-off-by: Rong Yin --- rhel/ovn-fedora.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 6a59ccc40..421d83869 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -50,7 +50,7 @@ BuildRequires: python3-devel BuildRequires: desktop-file-utils BuildRequires: groff graphviz BuildRequires: checkpolicy, selinux-policy-devel -BuildRequires: /usr/bin/sphinx-build +BuildRequires: /usr/bin/sphinx-build-3 # make check dependencies BuildRequires: procps-ng %if %{with libcapng}