Skip to content

Commit

Permalink
Update build instructions and Dockerfile to download submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
metaflow authored and drashna committed Mar 30, 2019
1 parent b846c25 commit 9321054
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 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 $KEYBOARD:$KEYMAP
CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP
2 changes: 2 additions & 0 deletions docs/getting_started_build_tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 \
make "$keyboard${keymap:+:$keymap}${target:+:$target}"
/bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\""

0 comments on commit 9321054

Please sign in to comment.