diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-04-10 23:15:51 +0200 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-04-10 14:15:51 -0700 |
| commit | 4882f7f16d3d5ef850790c935cf02112a615fd3e (patch) | |
| tree | 412280ae3b8bcabee493d6bd934b33c256ff6a25 | |
| parent | 45620fd289ad81f6bd34cf6a95e86f86d7577b9a (diff) | |
Revert "Update build instructions and docker file to download submodules" (#5533)
* Revert "Update build instructions and Dockerfile to download submodules"
This reverts commit 93210547bd1bfbbb1ffd56801bb81af46af350a5.
* Update build tools docs based on feedback
* Fix bad link in build tools docs
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | docs/getting_started_build_tools.md | 6 | ||||
| -rwxr-xr-x | util/docker_build.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index c4acfec71a..6bd5acb335 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,4 @@ VOLUME /qmk_firmware WORKDIR /qmk_firmware COPY . . -CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP +CMD make $KEYBOARD:$KEYMAP diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md index b72f52e189..0e1acca66a 100644 --- a/docs/getting_started_build_tools.md +++ b/docs/getting_started_build_tools.md @@ -2,11 +2,11 @@ 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 +**Note:** If this is your first time here, check out the [Complete Newbs Guide](newbs.md) page. + +Before continuing, double check that your submodules (third-party libraries) are up to date by running `make git-submodule`. ## Linux diff --git a/util/docker_build.sh b/util/docker_build.sh index 35839ac41e..e7aeac8f3e 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 \ - /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\"" + make "$keyboard${keymap:+:$keymap}${target:+:$target}" |