| Message ID | 1474313464-30598-1-git-send-email-cascardo@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On Mon, Sep 19, 2016 at 04:31:03PM -0300, Thadeu Lima de Souza Cascardo wrote: > Clean the source directory before building, otherwise, build might fail if it > has been configured already. > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> > --- > Vagrantfile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Vagrantfile b/Vagrantfile > index 72f224c..11bd048 100644 > --- a/Vagrantfile > +++ b/Vagrantfile > @@ -33,6 +33,8 @@ SCRIPT > $configure_ovs = <<SCRIPT > cd /vagrant > ./boot.sh > +./configure > +make distclean Seems a little weird given that the build script doesn't actually do an in-tree build but an out-of-tree one. Based on that, I guess that this is to guard against the case where someone manually does an in-tree build. That's probably an unusual case, so it seems a little wasteful to always do an extra configure/distclean step to handle it. If that analysis is right, then how about adding something like this instead: test -f Makefile && make distclean which would only do the distclean if the tree was in fact configured.
On Tue, Oct 04, 2016 at 12:00:33PM -0700, Ben Pfaff wrote: > On Mon, Sep 19, 2016 at 04:31:03PM -0300, Thadeu Lima de Souza Cascardo wrote: > > Clean the source directory before building, otherwise, build might fail if it > > has been configured already. > > > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> > > --- > > Vagrantfile | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/Vagrantfile b/Vagrantfile > > index 72f224c..11bd048 100644 > > --- a/Vagrantfile > > +++ b/Vagrantfile > > @@ -33,6 +33,8 @@ SCRIPT > > $configure_ovs = <<SCRIPT > > cd /vagrant > > ./boot.sh > > +./configure > > +make distclean > > Seems a little weird given that the build script doesn't actually do an > in-tree build but an out-of-tree one. Based on that, I guess that this > is to guard against the case where someone manually does an in-tree > build. That's probably an unusual case, so it seems a little wasteful > to always do an extra configure/distclean step to handle it. > > If that analysis is right, then how about adding something like this > instead: > test -f Makefile && make distclean > which would only do the distclean if the tree was in fact configured. Well, the thing is that we sync with whatever is on the host, where I do some development and some testing, including builds before I fire up tests inside vagrant. Then, it's a waste of time to get the vagrant system up and fail. I will give a go at checking for the Makefile. Seems a good solution. Thanks. Cascardo.
On Tue, Oct 04, 2016 at 04:12:00PM -0300, Thadeu Lima de Souza Cascardo wrote: > On Tue, Oct 04, 2016 at 12:00:33PM -0700, Ben Pfaff wrote: > > On Mon, Sep 19, 2016 at 04:31:03PM -0300, Thadeu Lima de Souza Cascardo wrote: > > > Clean the source directory before building, otherwise, build might fail if it > > > has been configured already. > > > > > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> > > > --- > > > Vagrantfile | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/Vagrantfile b/Vagrantfile > > > index 72f224c..11bd048 100644 > > > --- a/Vagrantfile > > > +++ b/Vagrantfile > > > @@ -33,6 +33,8 @@ SCRIPT > > > $configure_ovs = <<SCRIPT > > > cd /vagrant > > > ./boot.sh > > > +./configure > > > +make distclean > > > > Seems a little weird given that the build script doesn't actually do an > > in-tree build but an out-of-tree one. Based on that, I guess that this > > is to guard against the case where someone manually does an in-tree > > build. That's probably an unusual case, so it seems a little wasteful > > to always do an extra configure/distclean step to handle it. > > > > If that analysis is right, then how about adding something like this > > instead: > > test -f Makefile && make distclean > > which would only do the distclean if the tree was in fact configured. > > Well, the thing is that we sync with whatever is on the host, where I do some > development and some testing, including builds before I fire up tests inside > vagrant. Then, it's a waste of time to get the vagrant system up and fail. I > will give a go at checking for the Makefile. Seems a good solution. OK. If it turns out to make more sense to do the configure/distclean pairing, let me know. It just seems wasteful, not incorrect.
diff --git a/Vagrantfile b/Vagrantfile index 72f224c..11bd048 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -33,6 +33,8 @@ SCRIPT $configure_ovs = <<SCRIPT cd /vagrant ./boot.sh +./configure +make distclean mkdir -p ~/build cd ~/build /vagrant/configure --with-linux=/lib/modules/`uname -r`/build --enable-silent-rules
Clean the source directory before building, otherwise, build might fail if it has been configured already. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> --- Vagrantfile | 2 ++ 1 file changed, 2 insertions(+)