瀏覽代碼

Update build instructions and Dockerfile to download submodules

Mikhail Goncharov 7 年之前
父節點
當前提交
93210547bd
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 1 1
      Dockerfile
  2. 2 0
      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 $KEYBOARD:$KEYMAP
+CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP

+ 2 - 0
docs/getting_started_build_tools.md

@@ -2,6 +2,8 @@
 
 
 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 it is your first time here, Check out the "Complete Newbs guide" instead

+ 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 \
-	make "$keyboard${keymap:+:$keymap}${target:+:$target}"
+	/bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\""