From patchwork Tue Aug 6 12:56:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1142765 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 462vmD3pXNz9sMr for ; Tue, 6 Aug 2019 22:56:58 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4E172E1D; Tue, 6 Aug 2019 12:56:55 +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 819F8DDD for ; Tue, 6 Aug 2019 12:56:53 +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 102218A6 for ; Tue, 6 Aug 2019 12:56:53 +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 A359B30BCBB9 for ; Tue, 6 Aug 2019 12:56:52 +0000 (UTC) Received: from nusiddiq.mac (unknown [10.74.10.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2F195C1D6 for ; Tue, 6 Aug 2019 12:56:51 +0000 (UTC) From: nusiddiq@redhat.com To: dev@openvswitch.org Date: Tue, 6 Aug 2019 18:26:47 +0530 Message-Id: <20190806125647.23332-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.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 06 Aug 2019 12:56:52 +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 ovn] Correct the include path when including the header files from lib folder 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 Compilation will fail when we try to build ovn from external ovs directory. Earlier commit [1] missed changing the include path for lib/*.c files. [1] - a469954c00c4 ("Include ovn header files from lib/ instead of ovn/lib/") Signed-off-by: Numan Siddique Acked-by: Mark Michelson --- controller/ip-mcast.c | 2 +- lib/acl-log.c | 2 +- lib/actions.c | 4 ++-- lib/extend-table.c | 2 +- lib/mcast-group-index.c | 4 ++-- lib/ovn-nb-idl.ann | 2 +- lib/ovn-util.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/controller/ip-mcast.c b/controller/ip-mcast.c index ef36be2ca..9b0b4465a 100644 --- a/controller/ip-mcast.c +++ b/controller/ip-mcast.c @@ -17,7 +17,7 @@ #include "ip-mcast.h" #include "lport.h" -#include "ovn/lib/ovn-sb-idl.h" +#include "lib/ovn-sb-idl.h" /* * Used for (faster) updating of IGMP_Group ports. diff --git a/lib/acl-log.c b/lib/acl-log.c index f47b0af43..220b6dc30 100644 --- a/lib/acl-log.c +++ b/lib/acl-log.c @@ -15,7 +15,7 @@ */ #include -#include "ovn/lib/acl-log.h" +#include "acl-log.h" #include #include "flow.h" #include "openvswitch/json.h" diff --git a/lib/actions.c b/lib/actions.c index b0cb3490b..81950e7df 100644 --- a/lib/actions.c +++ b/lib/actions.c @@ -17,9 +17,11 @@ #include #include #include +#include "acl-log.h" #include "bitmap.h" #include "byte-order.h" #include "compiler.h" +#include "extend-table.h" #include "ovn-l7.h" #include "hash.h" #include "lib/packets.h" @@ -33,8 +35,6 @@ #include "ovn/actions.h" #include "ovn/expr.h" #include "ovn/lex.h" -#include "ovn/lib/acl-log.h" -#include "ovn/lib/extend-table.h" #include "packets.h" #include "openvswitch/shash.h" #include "simap.h" diff --git a/lib/extend-table.c b/lib/extend-table.c index ccf70ca72..77208feb5 100644 --- a/lib/extend-table.c +++ b/lib/extend-table.c @@ -18,10 +18,10 @@ #include #include "bitmap.h" +#include "extend-table.h" #include "hash.h" #include "lib/uuid.h" #include "openvswitch/vlog.h" -#include "ovn/lib/extend-table.h" VLOG_DEFINE_THIS_MODULE(extend_table); diff --git a/lib/mcast-group-index.c b/lib/mcast-group-index.c index 740311e00..de80f545a 100644 --- a/lib/mcast-group-index.c +++ b/lib/mcast-group-index.c @@ -15,8 +15,8 @@ #include -#include "ovn/lib/mcast-group-index.h" -#include "ovn/lib/ovn-sb-idl.h" +#include "mcast-group-index.h" +#include "ovn-sb-idl.h" struct ovsdb_idl_index * mcast_group_index_create(struct ovsdb_idl *idl) diff --git a/lib/ovn-nb-idl.ann b/lib/ovn-nb-idl.ann index 76d7384fc..ea813d658 100644 --- a/lib/ovn-nb-idl.ann +++ b/lib/ovn-nb-idl.ann @@ -6,4 +6,4 @@ # it can generate more programmer-friendly data structures. s["idlPrefix"] = "nbrec_" -s["idlHeader"] = "\"ovn/lib/ovn-nb-idl.h\"" +s["idlHeader"] = "\"lib/ovn-nb-idl.h\"" diff --git a/lib/ovn-util.c b/lib/ovn-util.c index de745d73f..085498fd1 100644 --- a/lib/ovn-util.c +++ b/lib/ovn-util.c @@ -16,8 +16,8 @@ #include "ovn-util.h" #include "dirs.h" #include "openvswitch/vlog.h" -#include "ovn/lib/ovn-nb-idl.h" -#include "ovn/lib/ovn-sb-idl.h" +#include "ovn-nb-idl.h" +#include "ovn-sb-idl.h" VLOG_DEFINE_THIS_MODULE(ovn_util);