diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 17:18:54 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 17:18:54 +0200 |
| commit | 4c2cc65ca63141839ac4036cb8704b7ee7f27cb1 (patch) | |
| tree | bfb7557f5d98ade8d78994d187c475f8f8a64f73 | |
| parent | d79a80e8bed19ebbff333c244c3c90bae39c9181 (diff) | |
| download | px4-firmware-4c2cc65ca63141839ac4036cb8704b7ee7f27cb1.tar.gz px4-firmware-4c2cc65ca63141839ac4036cb8704b7ee7f27cb1.tar.bz2 px4-firmware-4c2cc65ca63141839ac4036cb8704b7ee7f27cb1.zip | |
Cleaning up sub modules
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | Tools/check_submodules.sh | 8 | ||||
| -rw-r--r-- | makefiles/setup.mk | 1 | ||||
| m--------- | mavlink/include/mavlink/v1.0 | 0 |
5 files changed, 19 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index c5116c1cb..e352e15f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ -[submodule "mavlink/include/mavlink/v1.0"] +[submodule "mavlink"] path = mavlink/include/mavlink/v1.0 url = https://github.com/mavlink/c_library.git +[submodule "mavlink/include/mavlink/v1.0"] + path = mavlink/include/mavlink/v1.0 + url = git://github.com/mavlink/c_library.git @@ -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 diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 183b143d6..6a092ef6b 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -46,6 +46,7 @@ export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src)/ export PX4_LIB_DIR = $(abspath $(PX4_BASE)/src/lib)/ export PX4_MK_DIR = $(abspath $(PX4_BASE)/makefiles)/ export NUTTX_SRC = $(abspath $(PX4_BASE)/NuttX/nuttx)/ +export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink/include/mavlink/v1.0)/ export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/NuttX/apps)/ export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink)/ export ROMFS_SRC = $(abspath $(PX4_BASE)/ROMFS)/ diff --git a/mavlink/include/mavlink/v1.0 b/mavlink/include/mavlink/v1.0 new file mode 160000 +Subproject 45a71d6564bc5c47ed97d620089e17ca48bab73 |