From 42051b51ed670a216f6cbf7945a270aa8ef92db5 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 2 Nov 2017 16:44:44 +0000 Subject: [PATCH] travis 9: bash -x debugging, make-host make nproc optional --- .travis.yml | 2 +- kernel_module/make-host.sh | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3383e4f..8458db6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ install: | script: | cd "$TRAVIS_BUILD_DIR" - ./run -e 'init=/poweroff.out' -j 16 -n -v + bash -x ./run -e 'init=/poweroff.out' -j 16 -n -v diff --git a/kernel_module/make-host.sh b/kernel_module/make-host.sh index e08f866..c43a9ed 100755 --- a/kernel_module/make-host.sh +++ b/kernel_module/make-host.sh @@ -11,5 +11,14 @@ # Trying to add `-i` to overcome incompatible modules will fail, # because any build failure prevents the generation of all `.mod.c` files. -make -j $(($(nproc) - 2)) BR2_EXTERNAL_KERNEL_MODULE_PATH="$(pwd)" LINUX_DIR="/lib/modules/$(uname -r)/build" "$@" -make -C user/ -j $(($(nproc) - 2)) "$@" +j="$(($(nproc) - 2))" +while getopts j: OPT; do + case "$OPT" in + 'j') + j="$OPTARG" + ;; + esac +done +shift $(($OPTIND - 1)) +make -j "$j" KERNEL_MODULE_PATH="$(pwd)" LINUX_DIR="/lib/modules/$(uname -r)/build" "$@" +make -C user/ -j "$j" "$@"