summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-23 09:54:16 -0700
committerBen Pfaff <blp@nicira.com>2012-07-23 12:38:01 -0700
commit90af85e4d0233eedad912c71b593cdd41ff6cd94 (patch)
treebe72b36086a8c2ce1f2e34822ed287ed17d16b55
parent70b2a704a855573bc18dac1e6a5ee587aaa75b0c (diff)
downloadopenvswitch-90af85e4d0233eedad912c71b593cdd41ff6cd94.tar.gz
Fix race condition in parallel execution of "make install".
ovs-vsctl is listed, incorrectly, in both bin_PROGRAMS and bin_SCRIPTS. This meant that "make install" with the -j option could try to install ovs-vsctl two times in parallel, a race that occasionally caused a build failure, e.g.: http://buildd.debian.org/status/fetch.php?pkg=openvswitch&arch=s390&ver=1.4.2%2Bgit20120612-5&stamp=1342851603 Debian bug #682384. CC: 682384@bugs.debian.org Reported-by: Bastian Blank <waldi@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--utilities/automake.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/utilities/automake.mk b/utilities/automake.mk
index f3da1b168..00954169f 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -4,7 +4,7 @@ bin_PROGRAMS += \
utilities/ovs-dpctl \
utilities/ovs-ofctl \
utilities/ovs-vsctl
-bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl utilities/ovs-parse-leaks
+bin_SCRIPTS += utilities/ovs-pki utilities/ovs-parse-leaks
if HAVE_PYTHON
bin_SCRIPTS += \
utilities/ovs-pcap \