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:16 -0700
commit437f9686a8cb75dafc38f6dd38ff5b42fe34580d (patch)
tree0cec5cc8b71aca4ec687a6a17c30b45d48db9b95
parent903c82fa6ef6618f041d9b62996570028385850c (diff)
downloadopenvswitch-437f9686a8cb75dafc38f6dd38ff5b42fe34580d.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 89078cb81..4bf39d8ac 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 \