From patchwork Tue Sep 10 09:40:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1160181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46SKlw5Bgnz9s00 for ; Tue, 10 Sep 2019 19:40:59 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4478DE94; Tue, 10 Sep 2019 09:40:57 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 5EBBECD4 for ; Tue, 10 Sep 2019 09:40:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D175C83A for ; Tue, 10 Sep 2019 09:40:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C1451DB8 for ; Tue, 10 Sep 2019 09:40:54 +0000 (UTC) Received: from nummac.local (ovpn-116-211.sin2.redhat.com [10.67.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 165B15C548; Tue, 10 Sep 2019 09:40:51 +0000 (UTC) From: nusiddiq@redhat.com To: dev@openvswitch.org Date: Tue, 10 Sep 2019 15:10:42 +0530 Message-Id: <20190910094042.11165-1-nusiddiq@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Tue, 10 Sep 2019 09:40:54 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] Exclude ovn-nb/ovn-sb man and OVN schema files during compilation. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Numan Siddique The commit [1] removed OVN, but had to leave out some OVN bits for the ovsdb-server raft testing. But "make install" is installing ovn-nb/ovn-sb man entries and OVN schema files. This patch excludes these. "make install" is also installing ovn-nbctl/ovn-sbctl and this still needs to be addressed. [1] - f3e24610ea8("Remove OVN.") Signed-off-by: Numan Siddique --- ovn/automake.mk | 83 ++------------------------------------- ovn/utilities/automake.mk | 10 +---- 2 files changed, 6 insertions(+), 87 deletions(-) diff --git a/ovn/automake.mk b/ovn/automake.mk index afaf0688c..7d16c6036 100644 --- a/ovn/automake.mk +++ b/ovn/automake.mk @@ -1,82 +1,7 @@ -# OVN southbound schema and IDL -EXTRA_DIST += ovn/ovn-sb.ovsschema -pkgdata_DATA += ovn/ovn-sb.ovsschema - -# OVN southbound E-R diagram -# -# If "python" or "dot" is not available, then we do not add graphical diagram -# to the documentation. -if HAVE_PYTHON -if HAVE_DOT -ovn/ovn-sb.gv: ovsdb/ovsdb-dot.in ovn/ovn-sb.ovsschema - $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn/ovn-sb.ovsschema > $@ -ovn/ovn-sb.pic: ovn/ovn-sb.gv ovsdb/dot2pic - $(AM_V_GEN)(dot -T plain < ovn/ovn-sb.gv | $(PYTHON) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \ - mv $@.tmp $@ -OVN_SB_PIC = ovn/ovn-sb.pic -OVN_SB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_SB_PIC) -CLEANFILES += ovn/ovn-sb.gv ovn/ovn-sb.pic -endif -endif - -# OVN southbound schema documentation -EXTRA_DIST += ovn/ovn-sb.xml -CLEANFILES += ovn/ovn-sb.5 -man_MANS += ovn/ovn-sb.5 -ovn/ovn-sb.5: \ - ovsdb/ovsdb-doc ovn/ovn-sb.xml ovn/ovn-sb.ovsschema $(OVN_SB_PIC) - $(AM_V_GEN)$(OVSDB_DOC) \ - $(OVN_SB_DOT_DIAGRAM_ARG) \ - --version=$(VERSION) \ - $(srcdir)/ovn/ovn-sb.ovsschema \ - $(srcdir)/ovn/ovn-sb.xml > $@.tmp && \ - mv $@.tmp $@ - -# OVN northbound schema and IDL -EXTRA_DIST += ovn/ovn-nb.ovsschema -pkgdata_DATA += ovn/ovn-nb.ovsschema - -# OVN northbound E-R diagram -# -# If "python" or "dot" is not available, then we do not add graphical diagram -# to the documentation. -if HAVE_PYTHON -if HAVE_DOT -ovn/ovn-nb.gv: ovsdb/ovsdb-dot.in ovn/ovn-nb.ovsschema - $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn/ovn-nb.ovsschema > $@ -ovn/ovn-nb.pic: ovn/ovn-nb.gv ovsdb/dot2pic - $(AM_V_GEN)(dot -T plain < ovn/ovn-nb.gv | $(PYTHON) $(srcdir)/ovsdb/dot2pic -f 3) > $@.tmp && \ - mv $@.tmp $@ -OVN_NB_PIC = ovn/ovn-nb.pic -OVN_NB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_NB_PIC) -CLEANFILES += ovn/ovn-nb.gv ovn/ovn-nb.pic -endif -endif - -# OVN northbound schema documentation -EXTRA_DIST += ovn/ovn-nb.xml -CLEANFILES += ovn/ovn-nb.5 -man_MANS += ovn/ovn-nb.5 -ovn/ovn-nb.5: \ - ovsdb/ovsdb-doc ovn/ovn-nb.xml ovn/ovn-nb.ovsschema $(OVN_NB_PIC) - $(AM_V_GEN)$(OVSDB_DOC) \ - $(OVN_NB_DOT_DIAGRAM_ARG) \ - --version=$(VERSION) \ - $(srcdir)/ovn/ovn-nb.ovsschema \ - $(srcdir)/ovn/ovn-nb.xml > $@.tmp && \ - mv $@.tmp $@ - -# Version checking for ovn-nb.ovsschema. -ALL_LOCAL += ovn/ovn-nb.ovsschema.stamp -ovn/ovn-nb.ovsschema.stamp: ovn/ovn-nb.ovsschema - $(srcdir)/build-aux/cksum-schema-check $? $@ -CLEANFILES += ovn/ovn-nb.ovsschema.stamp - -# Version checking for ovn-sb.ovsschema. -ALL_LOCAL += ovn/ovn-sb.ovsschema.stamp -ovn/ovn-sb.ovsschema.stamp: ovn/ovn-sb.ovsschema - $(srcdir)/build-aux/cksum-schema-check $? $@ -CLEANFILES += ovn/ovn-sb.ovsschema.stamp +EXTRA_DIST += ovn/ovn-sb.ovsschema \ + ovn/ovn-sb.xml \ + ovn/ovn-nb.ovsschema \ + ovn/ovn-nb.xml include ovn/lib/automake.mk include ovn/utilities/automake.mk diff --git a/ovn/utilities/automake.mk b/ovn/utilities/automake.mk index c2c3b7d5c..d2e2675c0 100644 --- a/ovn/utilities/automake.mk +++ b/ovn/utilities/automake.mk @@ -1,12 +1,6 @@ -man_MANS += \ - ovn/utilities/ovn-nbctl.8 \ - ovn/utilities/ovn-sbctl.8 - -MAN_ROOTS += \ - ovn/utilities/ovn-sbctl.8.in - EXTRA_DIST += \ - ovn/utilities/ovn-nbctl.8.xml + ovn/utilities/ovn-nbctl.8.xml \ + ovn/utilities/ovn-sbctl.8.in CLEANFILES += \ ovn/utilities/ovn-nbctl.8 \