diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | Tools/check_submodules.sh | 12 |
2 files changed, 7 insertions, 6 deletions
@@ -218,6 +218,7 @@ checksubmodules: .PHONY: updatesubmodules updatesubmodules: + $(Q) (git submodule init) $(Q) (git submodule update) # diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index 1156490d7..fb180ef47 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -2,11 +2,11 @@ if [ -d NuttX/nuttx ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0") + STATUSRETVAL=$(git status --porcelain | grep -i "NuttX") if [ "$STATUSRETVAL" == "" ]; then - echo "Checked mavlink submodule, correct version found" + echo "Checked NuttX submodule, correct version found" else - echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'" + echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'" echo "or follow instructions on http://pixhawk.org/dev/git/submodules" exit 1 fi @@ -18,11 +18,11 @@ fi if [ -d mavlink/include/mavlink/v1.0 ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "NuttX") + STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0") if [ "$STATUSRETVAL" == "" ]; then - echo "Checked NuttX submodule, correct version found" + echo "Checked mavlink submodule, correct version found" else - echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'" + echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'" echo "or follow instructions on http://pixhawk.org/dev/git/submodules" exit 1 fi |