On Mon, Mar 7, 2016 at 2:39 PM, Russell Bryant <russ...@ovn.org> wrote:
> > > On Mon, Mar 7, 2016 at 1:15 PM, Ben Pfaff <b...@ovn.org> wrote: > >> On Mon, Mar 07, 2016 at 10:34:30AM -0500, Russell Bryant wrote: >> > On Mon, Mar 7, 2016 at 9:37 AM, Russell Bryant <russ...@ovn.org> wrote: >> > >> > > >> > > >> > > On Mon, Mar 7, 2016 at 12:03 AM, <bscha...@redhat.com> wrote: >> > > >> > >> Perviously it was using the platform's runtime directory which can be >> > >> different from the runtime directory of ovsdb-server started by the >> > >> openvswitch service >> > >> >> > >> Signed-off-by: Babu Shanmugam <bscha...@redhat.com> >> > >> >> > >> >> > > Thanks! I added the ack from Flavio and applied this to master. >> > > >> > > >> > It looks like this patch broke the build on travis-ci. For example: >> > >> > https://travis-ci.org/openvswitch/ovs/jobs/114254913 >> > >> > It probably has to do with using a separate build directory. I'm >> looking >> > into how to fix it, but haven't worked it out just yet. >> >> It probably needs something like in $(update_rhel_spec), so that if it's >> just old but not incorrect it just gets touched instead of overwritten. >> (It's a nasty kluge.) >> > > Thanks for the tip. I think that has me on the right track now. > This is pretty annoying, actually. I tried to apply that same fix. with the following patch: > diff --git a/rhel/automake.mk b/rhel/automake.mk > index dc53986..214cda4 100644 > --- a/rhel/automake.mk > +++ b/rhel/automake.mk > @@ -33,7 +33,8 @@ EXTRA_DIST += \ > rhel/usr_lib_systemd_system_ovn-northd.service > > update_rhel_spec = \ > - $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \ > + $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g' \ > + -e 's,[@]RUNDIR[@],$(RUNDIR),g') \ > < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ > if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi > > @@ -53,6 +54,7 @@ $(srcdir)/rhel/openvswitch-fedora.spec: rhel/ openvswitch-fedora.spec.in $(top_bu > $(update_rhel_spec) > > $(srcdir)/rhel/usr_lib_systemd_system_ovn-controller.service: rhel/ usr_lib_systemd_system_ovn-controller.service.in $(top_builddir)/config.status > + $(update_rhel_spec) > > RPMBUILD_TOP := $(abs_top_builddir)/rpm/rpmbuild This fails because ovn-controller.service does actually change. @RUNDIR@ is different between the original build and "make distcheck". /usr/local/var/run/openvswitch vs. /home/travis/build/russellb/ovs/openvswitch-2.5.90/_inst/var/run/openvswitch It seems pretty odd that @RUNDIR@ is different in "make distcheck", though. -- Russell Bryant _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
