[incubator-nuttx-testing] branch master updated: cibuild.sh: Remove the flock installation

[bt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new d2d80e7  cibuild.sh: Remove the flock installation
d2d80e7 is described below

commit d2d80e7a9b367fb6b9c7c4f4198a33286730d79c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Sep 23 14:40:13 2020 +0800

    cibuild.sh: Remove the flock installation
    
    follow up the apps repo change:
    commit 18137c0fec3cea30871f29238e11ea0f4e8523da
    Author: Matias N <ma...@protobits.dev>
    Date:   Sat Sep 12 00:36:23 2020 -0300
    
        Fix: ensure archive files do not carry object files from prior builds
    
        This is the corresponding change to the one on main NuttX repo. In this
        case this involves splitting the build of libapps.a into: a) building
        all applications (which is safely parallelizable), b) adding each
        application's object files to the archive in turns (serial by nature).
    
        This removes the need for the flock used to protect the parallel build.
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 cibuild.sh | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/cibuild.sh b/cibuild.sh
index 004216a..928ea8f 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -37,7 +37,7 @@ EXTRA_PATH=
 
 case $os in
   Darwin)
-    install="python-tools u-boot-tools discoteq-flock elf-toolchain gen-romfs kconfig-frontends arm-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain avr-gcc-toolchain c-cache binutils"
+    install="python-tools u-boot-tools elf-toolchain gen-romfs kconfig-frontends arm-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain avr-gcc-toolchain c-cache binutils"
     mkdir -p ${prebuilt}/homebrew
     export HOMEBREW_CACHE=${prebuilt}/homebrew
     ;;
@@ -70,17 +70,6 @@ function u-boot-tools {
   fi
 }
 
-function discoteq-flock {
-  if ! type flock > /dev/null; then
-    case $os in
-      Darwin)
-        brew tap discoteq/discoteq
-        brew install flock
-        ;;
-    esac
-  fi
-}
-
 function elf-toolchain {
   if ! type x86_64-elf-gcc > /dev/null; then
     case $os in