From: Ben Pfaff Date: Mon, 23 Jul 2012 16:54:16 +0000 (-0700) Subject: Fix race condition in parallel execution of "make install". X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff_plain;h=ae755ca7e1efc425862d7ce51ac12ac0b2df677a 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 Signed-off-by: Ben Pfaff --- diff --git a/utilities/automake.mk b/utilities/automake.mk index 04a7fdcc..7bb2c6d6 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-l3ping \