소스 검색

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
Konstantin Đorđević 6 년 전
부모
커밋
4882f7f16d
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      Dockerfile
  2. 3 3
      docs/getting_started_build_tools.md
  3. 1 1
      util/docker_build.sh

+ 1 - 1
Dockerfile

@@ -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

+ 3 - 3
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).
 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
 
 

+ 1 - 1
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
 # 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}"