| Message ID | 20190806125647.23332-1-nusiddiq@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,ovn] Correct the include path when including the header files from lib folder | expand |
Acked-by: Mark Michelson <mmichels@redhat.com> On 8/6/19 8:56 AM, nusiddiq@redhat.com wrote: > From: Numan Siddique <nusiddiq@redhat.com> > > 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 <nusiddiq@redhat.com> > --- > 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 <config.h> > -#include "ovn/lib/acl-log.h" > +#include "acl-log.h" > #include <string.h> > #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 <config.h> > #include <stdarg.h> > #include <stdbool.h> > +#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 <string.h> > > #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 <config.h> > > -#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); > >
On Tue, Aug 6, 2019 at 8:26 PM Mark Michelson <mmichels@redhat.com> wrote: > Acked-by: Mark Michelson <mmichels@redhat.com> > Thanks for the review. I applied this to master. Numan > > On 8/6/19 8:56 AM, nusiddiq@redhat.com wrote: > > From: Numan Siddique <nusiddiq@redhat.com> > > > > 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 <nusiddiq@redhat.com> > > --- > > 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 <config.h> > > -#include "ovn/lib/acl-log.h" > > +#include "acl-log.h" > > #include <string.h> > > #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 <config.h> > > #include <stdarg.h> > > #include <stdbool.h> > > +#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 <string.h> > > > > #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 <config.h> > > > > -#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); > > > > > >
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 <config.h> -#include "ovn/lib/acl-log.h" +#include "acl-log.h" #include <string.h> #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 <config.h> #include <stdarg.h> #include <stdbool.h> +#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 <string.h> #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 <config.h> -#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);