aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2019-04-10 23:15:51 +0200
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-04-10 14:15:51 -0700
commit4882f7f16d3d5ef850790c935cf02112a615fd3e (patch)
tree412280ae3b8bcabee493d6bd934b33c256ff6a25
parent45620fd289ad81f6bd34cf6a95e86f86d7577b9a (diff)
downloadqmk_firmware-4882f7f16d3d5ef850790c935cf02112a615fd3e.tar.gz
qmk_firmware-4882f7f16d3d5ef850790c935cf02112a615fd3e.zip
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--Dockerfile2
-rw-r--r--docs/getting_started_build_tools.md6
-rwxr-xr-xutil/docker_build.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index c4acfec71..6bd5acb33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,4 +26,4 @@ VOLUME /qmk_firmware
26WORKDIR /qmk_firmware 26WORKDIR /qmk_firmware
27COPY . . 27COPY . .
28 28
29CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP 29CMD make $KEYBOARD:$KEYMAP
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md
index b72f52e18..0e1acca66 100644
--- a/docs/getting_started_build_tools.md
+++ b/docs/getting_started_build_tools.md
@@ -2,11 +2,11 @@
2 2
3This page describes setting up the build environment for QMK. These instructions cover AVR processors (such as the atmega32u4). 3This page describes setting up the build environment for QMK. These instructions cover AVR processors (such as the atmega32u4).
4 4
5After cloning the repo of QMK run `make git-submodule` once to download 3rd party libraries like ChibiOS.
6
7<!-- FIXME: We should have ARM instructions somewhere. --> 5<!-- FIXME: We should have ARM instructions somewhere. -->
8 6
9Note: If it is your first time here, Check out the "Complete Newbs guide" instead 7**Note:** If this is your first time here, check out the [Complete Newbs Guide](newbs.md) page.
8
9Before continuing, double check that your submodules (third-party libraries) are up to date by running `make git-submodule`.
10 10
11## Linux 11## Linux
12 12
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 35839ac41..e7aeac8f3 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
47 47
48# Run container and build firmware 48# Run container and build firmware
49docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \ 49docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \
50 /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\"" 50 make "$keyboard${keymap:+:$keymap}${target:+:$target}"