drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update build instructions and docker file to download submodules" (#5533)

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

This reverts commit 93210547bd.

* Update build tools docs based on feedback

* Fix bad link in build tools docs
This commit is contained in:
Konstantin Đorđević 2019-04-10 23:15:51 +02:00 committed by MechMerlin
parent 45620fd289
commit 4882f7f16d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,4 +26,4 @@ VOLUME /qmk_firmware
WORKDIR /qmk_firmware WORKDIR /qmk_firmware
COPY . . COPY . .
CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP CMD make $KEYBOARD:$KEYMAP

6
docs/getting_started_build_tools.md
View File

@ -2,11 +2,11 @@
This page describes setting up the build environment for QMK. These instructions cover AVR processors (such as the atmega32u4). 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. --> <!-- 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 ## Linux

2
util/docker_build.sh
View File

@ -47,4 +47,4 @@ dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
# Run container and build firmware # Run container and build firmware
docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_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}"