From 93210547bd1bfbbb1ffd56801bb81af46af350a5 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Tue, 10 Apr 2018 18:47:56 +0100 Subject: [PATCH] Update build instructions and Dockerfile to download submodules --- Dockerfile | 2 +- docs/getting_started_build_tools.md | 2 ++ util/docker_build.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6bd5acb335736505fc2cb4f400872244c07a8813..c4acfec71aa5b0e38154ff84eabe37dc6431634d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,4 @@ VOLUME /qmk_firmware WORKDIR /qmk_firmware COPY . . -CMD make $KEYBOARD:$KEYMAP +CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md index 1f771b1a04bf8e07c28fc5f1587095be31b6c845..b72f52e189e72f79baf6aa004022eb2a537816e7 100644 --- a/docs/getting_started_build_tools.md +++ b/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). +After cloning the repo of QMK run `make git-submodule` once to download 3rd party libraries like ChibiOS. + Note: If it is your first time here, Check out the "Complete Newbs guide" instead diff --git a/util/docker_build.sh b/util/docker_build.sh index e7aeac8f3e5f08aa2c23822e8122e14efe93c1f9..35839ac41eb218a9017de1cf65e584d0c107137c 100755 --- a/util/docker_build.sh +++ b/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 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}\""