diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 17:03:07 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 17:03:07 +0200 |
| commit | 6c5c6ba9ee6cfff9ea748f812902922a5c7addba (patch) | |
| tree | c4f6540065dbed0a644855bc07c8c8ad9ab388ab | |
| parent | b74d4e2ba76d1fa3d6d099b63192b180b1af0a39 (diff) | |
| download | px4-firmware-6c5c6ba9ee6cfff9ea748f812902922a5c7addba.tar.gz px4-firmware-6c5c6ba9ee6cfff9ea748f812902922a5c7addba.tar.bz2 px4-firmware-6c5c6ba9ee6cfff9ea748f812902922a5c7addba.zip | |
Add proper NuttX submodule checks
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | Tools/check_submodules.sh | 8 |
2 files changed, 14 insertions, 4 deletions
@@ -104,7 +104,7 @@ DESIRED_FIRMWARES = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4) STAGED_FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(IMAGE_DIR)$(config).px4) FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4) -all: $(DESIRED_FIRMWARES) +all: checksubmodules $(DESIRED_FIRMWARES) # # Copy FIRMWARES into the image directory. @@ -210,9 +210,11 @@ menuconfig: endif $(NUTTX_SRC): - @$(ECHO) "" - @$(ECHO) "NuttX sources missing - clone https://github.com/PX4/NuttX.git and try again." - @$(ECHO) "" + $(Q) if [ -d $(NUTTX_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "NuttX submodule missing, doing auto checkout"; git submodule init; git submodule update; fi + +.PHONY: checksubmodules +checksubmodules: + $(Q) if [ -d $(MAVLINK_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "MAVLink submodule missing, doing auto checkout"; git submodule init; git submodule update; fi # # Testing targets diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index 52ea7a146..c431e8225 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -7,4 +7,12 @@ else exit 1 fi +STATUSRETVAL=$(git status --porcelain | grep -i "M NuttX") +if [ "$STATUSRETVAL" == "" ]; then + echo "checked NuttX submodule, correct version found" +else + echo "NuttX sub repo not at correct version. Try 'git submodule update'" + exit 1 +fi + exit 0 |