Skip to content

Commit

Permalink
Revert "Update build instructions and docker file to download submodu…
Browse files Browse the repository at this point in the history
…les" (qmk#5533)

* Revert "Update build instructions and Dockerfile to download submodules"

This reverts commit 9321054.

* Update build tools docs based on feedback

* Fix bad link in build tools docs
  • Loading branch information
vomindoraan authored and mechmerlin committed Apr 10, 2019
1 parent 45620fd commit 4882f7f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ VOLUME /qmk_firmware
WORKDIR /qmk_firmware
COPY . .

CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP
CMD make $KEYBOARD:$KEYMAP
6 changes: 3 additions & 3 deletions docs/getting_started_build_tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion util/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

0 comments on commit 4882f7f

Please sign in to comment.