summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Goncharov <goncharov.mikhail@gmail.com>2018-04-10 18:47:56 +0100
committerDrashna Jaelre <drashna@live.com>2019-03-30 10:48:09 -0700
commit93210547bd1bfbbb1ffd56801bb81af46af350a5 (patch)
tree1d459a9f524f477fd17cb8373108073884d5c3af
parentb846c25a56f1c949094fd2f4f587cb358b7cd8c5 (diff)
Update build instructions and Dockerfile to download submodules
-rw-r--r--Dockerfile2
-rw-r--r--docs/getting_started_build_tools.md2
-rwxr-xr-xutil/docker_build.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 6bd5acb335..c4acfec71a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,4 +26,4 @@ VOLUME /qmk_firmware
WORKDIR /qmk_firmware
COPY . .
-CMD make $KEYBOARD:$KEYMAP
+CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md
index 1f771b1a04..b72f52e189 100644
--- a/docs/getting_started_build_tools.md
+++ b/docs/getting_started_build_tools.md
@@ -2,6 +2,8 @@
This page describes setting up the build environment for QMK. These instructions cover AVR processors (such as the atmega32u4).
+After cloning the repo of QMK run `make git-submodule` once to download 3rd party libraries like ChibiOS.
+
<!-- FIXME: We should have ARM instructions somewhere. -->
Note: If it is your first time here, Check out the "Complete Newbs guide" instead
diff --git a/util/docker_build.sh b/util/docker_build.sh
index e7aeac8f3e..35839ac41e 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -47,4 +47,4 @@ dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
# Run container and build firmware
docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \
- make "$keyboard${keymap:+:$keymap}${target:+:$target}"
+ /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\""