From 963c2d57aa63fa5421cf30698485bd4ba20e06aa Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Mon, 15 Oct 2018 15:54:11 +0200
Subject: [PATCH 01/22] Json library: fix a number of potential buffer
 overflows

---
 os/lib/json/jsonparse.c | 98 ++++++++++++++++++++++-------------------
 os/lib/json/jsontree.c  | 10 ++++-
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/os/lib/json/jsonparse.c b/os/lib/json/jsonparse.c
index 6277b56c4..941420521 100644
--- a/os/lib/json/jsonparse.c
+++ b/os/lib/json/jsonparse.c
@@ -32,34 +32,42 @@
 #include "jsonparse.h"
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
 /*--------------------------------------------------------------------*/
-static int
+static bool
 push(struct jsonparse_state *state, char c)
 {
-  state->stack[state->depth] = c;
-  state->depth++;
-  state->vtype = 0;
-  return state->depth < JSONPARSE_MAX_DEPTH;
+  if(state->depth < JSONPARSE_MAX_DEPTH) {
+    state->stack[state->depth] = c;
+    state->depth++;
+    state->vtype = 0;
+    return true;
+  } else {
+    return false;
+  }
 }
 /*--------------------------------------------------------------------*/
-static void
+static bool
 modify(struct jsonparse_state *state, char c)
 {
   if(state->depth > 0) {
     state->stack[state->depth - 1] = c;
+    return true;
+  } else {
+    return false;
   }
 }
 /*--------------------------------------------------------------------*/
-static char
+static bool
 pop(struct jsonparse_state *state)
 {
   if(state->depth == 0) {
-    return JSON_TYPE_ERROR;
+    return false;
   }
   state->depth--;
   state->vtype = state->stack[state->depth];
-  return state->stack[state->depth];
+  return true;
 }
 /*--------------------------------------------------------------------*/
 /* will pass by the value and store the start and length of the value for
@@ -134,15 +142,11 @@ skip_ws(struct jsonparse_state *state)
   }
 }
 /*--------------------------------------------------------------------*/
-static int
+static bool
 is_atomic(struct jsonparse_state *state)
 {
   char v = state->vtype;
-  if(v == 'N' || v == '"' || v == '0' || v == 'n' || v == 't' || v == 'f') {
-    return 1;
-  } else {
-    return 0;
-  }
+  return v == 'N' || v == '"' || v == '0' || v == 'n' || v == 't' || v == 'f';
 }
 /*--------------------------------------------------------------------*/
 void
@@ -163,6 +167,7 @@ jsonparse_next(struct jsonparse_state *state)
   char c;
   char s;
   char v;
+  bool ret;
 
   skip_ws(state);
   c = state->json[state->pos];
@@ -173,48 +178,51 @@ jsonparse_next(struct jsonparse_state *state)
   switch(c) {
   case '{':
     if((s == 0 && v == 0) || s == '[' || s == ':') {
-      push(state, c);
-    } else {
-      state->error = JSON_ERROR_UNEXPECTED_OBJECT;
-      return JSON_TYPE_ERROR;
+      if(push(state, c)) {
+        return c;
+      }
     }
-    return c;
+    state->error = JSON_ERROR_UNEXPECTED_OBJECT;
+    return JSON_TYPE_ERROR;
   case '}':
     if((s == ':' && v != ',' && v != 0 ) || (s == '{' && v == 0)) {
-      pop(state);
-    } else {
-      state->error = JSON_ERROR_UNEXPECTED_END_OF_OBJECT;
-      return JSON_TYPE_ERROR;
+      if(pop(state)) {
+        return c;
+      }
     }
-    return c;
+    state->error = JSON_ERROR_UNEXPECTED_END_OF_OBJECT;
+    return JSON_TYPE_ERROR;
   case ']':
     if(s == '[' && v != ',') {
-      pop(state);
-    } else {
-      state->error = JSON_ERROR_UNEXPECTED_END_OF_ARRAY;
-      return JSON_TYPE_ERROR;
+      if(pop(state)) {
+        return c;
+      }
     }
-    return c;
+    state->error = JSON_ERROR_UNEXPECTED_END_OF_ARRAY;
+    return JSON_TYPE_ERROR;
   case ':':
     if(s == '{' && v == 'N') {
-      modify(state, ':');
+      ret = modify(state, ':');
       state->vtype = 0;
-    } else {
-      state->error = JSON_ERROR_SYNTAX;
-      return JSON_TYPE_ERROR;
+      if(ret) {
+        return jsonparse_next(state);
+      }
     }
-    return jsonparse_next(state);
+    state->error = JSON_ERROR_SYNTAX;
+    return JSON_TYPE_ERROR;
   case ',':
     if(s == ':' && v != 0) {
-      modify(state, '{');
+      ret = modify(state, '{');
       state->vtype = c;
+      if(ret) {
+        return c;
+      }
     } else if(s == '[') {
       state->vtype = c;
-    } else {
-      state->error = JSON_ERROR_SYNTAX;
-      return JSON_TYPE_ERROR;
+      return c;
     }
-    return c;
+    state->error = JSON_ERROR_SYNTAX;
+    return JSON_TYPE_ERROR;
   case '"':
     if((s == 0 && v == 0) || s == '{' || s == '[' || s == ':') {
       return atomic(state, c = (s == '{' ? JSON_TYPE_PAIR_NAME : c));
@@ -225,12 +233,12 @@ jsonparse_next(struct jsonparse_state *state)
     return c;
   case '[':
     if((s == 0 && v == 0) || s == '[' || s == ':') {
-      push(state, c);
-    } else {
-      state->error = JSON_ERROR_UNEXPECTED_ARRAY;
-      return JSON_TYPE_ERROR;
+      if(push(state, c)) {
+        return c;
+      }
     }
-    return c;
+    state->error = JSON_ERROR_UNEXPECTED_ARRAY;
+    return JSON_TYPE_ERROR;
   case 0:
     if(v == 0 || state->depth > 0) {
       state->error = JSON_ERROR_SYNTAX;
diff --git a/os/lib/json/jsontree.c b/os/lib/json/jsontree.c
index 13d7d8604..259525376 100644
--- a/os/lib/json/jsontree.c
+++ b/os/lib/json/jsontree.c
@@ -198,7 +198,10 @@ jsontree_print_next(struct jsontree_context *js_ctx)
     } else {
       ov = o->values[index];
     }
-    /* TODO check max depth */
+    if(js_ctx->depth >= JSONTREE_MAX_DEPTH - 1) {
+      /* Too deep: return 0 */
+      return 0;
+    }
     js_ctx->depth++;          /* step down to value... */
     js_ctx->index[js_ctx->depth] = 0; /* and init index */
     js_ctx->values[js_ctx->depth] = ov;
@@ -299,7 +302,10 @@ find_next(struct jsontree_context *js_ctx)
       } else {
         ov = o->values[index];
       }
-      /* TODO check max depth */
+      if(js_ctx->depth >= JSONTREE_MAX_DEPTH - 1) {
+        /* Too deep: return NULL */
+        return NULL;
+      }
       js_ctx->depth++;        /* step down to value... */
       js_ctx->index[js_ctx->depth] = 0;       /* and init index */
       js_ctx->values[js_ctx->depth] = ov;

From 995a076262f924524b7423aa8d32812d968264ec Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:24:16 +0100
Subject: [PATCH 02/22] Explicitly set noninteractive frontent

---
 tools/docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 9d15704ac..6c84ecabf 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,5 +1,7 @@
 FROM 32bit/ubuntu:16.04
 
+ENV DEBIAN_FRONTEND noninteractive
+
 # Tools
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 20fa52997ca02626019f091608c9a604515be2dd Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:25:02 +0100
Subject: [PATCH 03/22] Quiet wget

---
 tools/docker/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 6c84ecabf..38c04a90c 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -11,21 +11,21 @@ RUN apt-get update && \
   && apt-get clean
 
 # Install ARM toolchain
-RUN wget https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 && \
+RUN wget -nv https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 && \
   tar xjf gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 -C /tmp/ && \
   cp -f -r /tmp/gcc-arm-none-eabi-5_2-2015q4/* /usr/local/ && \
   rm -rf /tmp/gcc-arm-none-eabi-* gcc-arm-none-eabi-*-linux.tar.bz2
 
 # Install msp430 toolchain
-RUN wget http://simonduq.github.io/resources/mspgcc-4.7.2-compiled.tar.bz2 && \
+RUN wget -nv http://simonduq.github.io/resources/mspgcc-4.7.2-compiled.tar.bz2 && \
   tar xjf mspgcc*.tar.bz2 -C /tmp/ && \
   cp -f -r /tmp/msp430/* /usr/local/ && \
   rm -rf /tmp/msp430 mspgcc*.tar.bz2
 
 # Install NXP toolchain (partial, with binaries excluded. Download from nxp.com)
-RUN wget http://simonduq.github.io/resources/ba-elf-gcc-4.7.4-part1.tar.bz2 && \
-  wget http://simonduq.github.io/resources/ba-elf-gcc-4.7.4-part2.tar.bz2 && \
-  wget http://simonduq.github.io/resources/jn516x-sdk-4163-1416.tar.bz2 && \
+RUN wget -nv http://simonduq.github.io/resources/ba-elf-gcc-4.7.4-part1.tar.bz2 && \
+  wget -nv http://simonduq.github.io/resources/ba-elf-gcc-4.7.4-part2.tar.bz2 && \
+  wget -nv http://simonduq.github.io/resources/jn516x-sdk-4163-1416.tar.bz2 && \
   mkdir /tmp/jn516x-sdk /tmp/ba-elf-gcc && \
   tar xjf jn516x-sdk-*.tar.bz2 -C /tmp/jn516x-sdk && \
   tar xjf ba-elf-gcc-*part1.tar.bz2 -C /tmp/ba-elf-gcc && \
@@ -37,7 +37,7 @@ RUN wget http://simonduq.github.io/resources/ba-elf-gcc-4.7.4-part1.tar.bz2 && \
 ENV PATH="/usr/ba-elf-gcc/bin:${PATH}"
 
 ## Install nRF52 SDK
-RUN wget https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip && \
+RUN wget -nv https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip && \
     mkdir /usr/nrf52-sdk && \
     unzip nrf5_iot_sdk_3288530.zip -d /usr/nrf52-sdk && \
     rm nrf5_iot_sdk_3288530.zip

From d756cb6e48abad103752baf307bbec65b132fb65 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:25:14 +0100
Subject: [PATCH 04/22] Quiet git clone

---
 tools/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 38c04a90c..27e476e61 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -90,7 +90,7 @@ RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E
   && sudo apt-get clean
 
 # Download, build and install Renode
-RUN git clone https://github.com/renode/renode.git \
+RUN git clone --quiet https://github.com/renode/renode.git \
   && cd ${HOME}/renode \
   && git checkout v1.3 \
   && ./build.sh

From 3c9eafc83b7f53f43002e44647ecf60ed0a84b05 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:25:40 +0100
Subject: [PATCH 05/22] Quiet pip output

---
 tools/docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 27e476e61..e4cb39037 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -46,9 +46,8 @@ ENV NRF52_SDK_ROOT /usr/nrf52-sdk
 
 # Install sphinx and sphinx_rtd_theme, required for building and testing the
 # readthedocs API documentation
-RUN pip install --upgrade pip
-RUN pip install setuptools
-RUN pip install sphinx_rtd_theme sphinx
+RUN pip -q install --upgrade pip
+RUN pip -q install setuptools && pip -q install sphinx_rtd_theme sphinx
 
 # Create user, enable X forwarding, add to group dialout
 # -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix

From 06ad0f26b3c2680e24683f99894e7c971f4a093e Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:25:52 +0100
Subject: [PATCH 06/22] Quiet unzip

---
 tools/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index e4cb39037..bd6dd4821 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -39,7 +39,7 @@ ENV PATH="/usr/ba-elf-gcc/bin:${PATH}"
 ## Install nRF52 SDK
 RUN wget -nv https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip && \
     mkdir /usr/nrf52-sdk && \
-    unzip nrf5_iot_sdk_3288530.zip -d /usr/nrf52-sdk && \
+    unzip -q nrf5_iot_sdk_3288530.zip -d /usr/nrf52-sdk && \
     rm nrf5_iot_sdk_3288530.zip
 
 ENV NRF52_SDK_ROOT /usr/nrf52-sdk

From b4684e3d5faec000f46db5e1062f81d565caec01 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:26:37 +0100
Subject: [PATCH 07/22] Single docker RUN for all apt- and npm work.

Quiet npm and run all of the above without sudo
---
 tools/docker/Dockerfile | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index bd6dd4821..8b156efb1 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -3,12 +3,20 @@ FROM 32bit/ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 
 # Tools
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends \
-  build-essential doxygen git wget unzip python-serial python-pip \
-  default-jdk ant srecord iputils-tracepath rlwrap \
-  mosquitto mosquitto-clients gdb \
-  && apt-get clean
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+  echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list && \
+  apt-get -qq update && \
+  apt-get -qq -y --no-install-recommends install \
+    build-essential doxygen git wget unzip python-serial python-pip \
+    default-jdk ant srecord iputils-tracepath rlwrap \
+    mosquitto mosquitto-clients gdb npm \
+    mono-complete gksu libgtk2.0-0 screen uml-utilities gtk-sharp2 \
+    libcanberra-gtk-module:i386 \
+  && apt-get -qq clean
+
+# Install coap-cli
+RUN npm -q install coap-cli -g \
+  && sudo ln -s /usr/bin/nodejs /usr/bin/node
 
 # Install ARM toolchain
 RUN wget -nv https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 && \
@@ -75,19 +83,6 @@ WORKDIR                 ${HOME}
 RUN echo "#!/bin/bash\nant -Dbasedir=${COOJA} -f ${COOJA}/build.xml run" > ${HOME}/cooja && \
   chmod +x ${HOME}/cooja
 
-# Install coap-cli
-RUN sudo apt-get install -y npm \
-  && sudo apt-get clean \
-  && sudo npm install coap-cli -g \
-  && sudo ln -s /usr/bin/nodejs /usr/bin/node
-
-# Install Mono and libcanberra-gtk:i386 (for Renode)
-RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-  && echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list \
-  && sudo apt-get update \
-  && sudo apt-get install -y mono-complete gksu libgtk2.0-0 screen uml-utilities gtk-sharp2 libcanberra-gtk-module:i386 \
-  && sudo apt-get clean
-
 # Download, build and install Renode
 RUN git clone --quiet https://github.com/renode/renode.git \
   && cd ${HOME}/renode \

From b25e7bedf93a54c2a4b30ba328ee1bd81fe08dff Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 20 Oct 2018 15:52:47 +0100
Subject: [PATCH 08/22] Redirect apt-get stdout to /dev/null

---
 tools/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 8b156efb1..634f85ea6 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
     default-jdk ant srecord iputils-tracepath rlwrap \
     mosquitto mosquitto-clients gdb npm \
     mono-complete gksu libgtk2.0-0 screen uml-utilities gtk-sharp2 \
-    libcanberra-gtk-module:i386 \
+    libcanberra-gtk-module:i386 > /dev/null \
   && apt-get -qq clean
 
 # Install coap-cli

From 08141e6b9b74fff6b7528c3180a6681e7b855f18 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sun, 21 Oct 2018 12:33:58 +0100
Subject: [PATCH 09/22] Sort apt-get install packages, one package per line

---
 tools/docker/Dockerfile | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 634f85ea6..6eb9dbb17 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -7,11 +7,30 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
   echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list && \
   apt-get -qq update && \
   apt-get -qq -y --no-install-recommends install \
-    build-essential doxygen git wget unzip python-serial python-pip \
-    default-jdk ant srecord iputils-tracepath rlwrap \
-    mosquitto mosquitto-clients gdb npm \
-    mono-complete gksu libgtk2.0-0 screen uml-utilities gtk-sharp2 \
-    libcanberra-gtk-module:i386 > /dev/null \
+    ant \
+    build-essential \
+    default-jdk \
+    doxygen \
+    gdb \
+    git \
+    gksu \
+    gtk-sharp2 \
+    iputils-tracepath \
+    libcanberra-gtk-module:i386 \
+    libgtk2.0-0 \
+    mono-complete \
+    mosquitto \
+    mosquitto-clients \
+    npm \
+    python-pip \
+    python-serial \
+    rlwrap \
+    screen \
+    srecord \
+    uml-utilities \
+    unzip \
+    wget \
+    > /dev/null \
   && apt-get -qq clean
 
 # Install coap-cli

From a2c9f75e468174075102b1e9dff95b507d9e77b4 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Fri, 19 Oct 2018 14:17:25 +0100
Subject: [PATCH 10/22] Add out of tree build tests

---
 .travis.yml                         | 17 +++++++++++++++--
 tests/19-out-of-tree-build/Makefile | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/19-out-of-tree-build/Makefile

diff --git a/.travis.yml b/.travis.yml
index 60d8db747..ca4dbf8d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,12 +34,22 @@ before_install:
   - if [ ${BUILD_COOJA:-false} = true ] ; then
       ant -q -f $CNG_HOST_PATH/tools/cooja/build.xml jar ;
     fi
+
+  # Create a directory for out of tree tests and clone the test repo therein
+  # The directory will need created unconditionally so we can always chgrp and
+  # mount it, even if empty. Checkout a pre-defined version.
+  - mkdir -p $OUT_OF_TREE_TEST_PATH
+  - if [ ${TEST_NAME} = "out-of-tree-build" ] ; then
+      git clone --depth 1 https://github.com/contiki-ng/out-of-tree-tests $OUT_OF_TREE_TEST_PATH &&
+      cd $OUT_OF_TREE_TEST_PATH &&
+      git checkout $OUT_OF_TREE_TEST_VER ;
+    fi
   # Set permissions for Docker mount
-  - sudo chgrp -hR 1000 $CNG_HOST_PATH
+  - sudo chgrp -hR 1000 $CNG_HOST_PATH $OUT_OF_TREE_TEST_PATH
 
 # The test script for each build
 script:
-  - docker run --privileged -v $CNG_HOST_PATH:/home/user/contiki-ng -ti $DOCKER_IMG bash --login -c "make -C tests/??-$TEST_NAME";
+  - docker run --privileged -v $OUT_OF_TREE_TEST_PATH:/home/user/out-of-tree-tests -v $CNG_HOST_PATH:/home/user/contiki-ng -ti $DOCKER_IMG bash --login -c "make -C tests/??-$TEST_NAME";
   # Check outcome of the test
   - $CNG_HOST_PATH/tests/check-test.sh $CNG_HOST_PATH/tests/??-$TEST_NAME; exit $?;
 
@@ -49,6 +59,8 @@ env:
   global:
     - DOCKER_IMG='contiker/contiki-ng'
     - CNG_HOST_PATH=`pwd`
+    - OUT_OF_TREE_TEST_PATH=$HOME/out-of-tree-tests
+    - OUT_OF_TREE_TEST_VER=2869ae7
     # Encrypted environment variables.
     # Only available on builds of contiki-ng/contiki-ng branches, not PRs or forks.
     - secure: 0nrV5yjpT2kE19Hlm7t619Qbmyjx/G7bSUI1c+U3kZbyuxnRlASjVcDN5uPBoimIfGiBRI0nRq690BogAJt4EKwbC1Dy8kC1XD8mRtQ2AIZ6PHaUoG9iS5sBhFBQK0XkB83bwh6omRn/04O0uuX74ooSWT7fDrWxi/y5+0ysXK6gRtOhdrJ3FU5OkNVewX8NeCdx3pOWhMOtXWdFkMIi1XRdDnvMM5/hHlHMkdXXtaZQX9UsK3Q3DSjPRLZjKRiOlcx9MIg2ebh9ITmd2Du2p2q/LKtoutJckvhbKQPWcZi/B+1ZTSff0FHBIg+EYxf6TeFuia7XSTWH7sr2CDCCtcvSR9bB5yW6jdmGfa8Af8I1TCBuqoSUo0Re50BZBZF7COleEh+IojbjXn2CIDMg5rT4Sh3qcMGvFn9OW1cz5h5UNSOk7EIAXXPcI7Aloxh2sBo4/DrvvbfIsKrvxV9Fx4bdyNtR7dZ7xsoOw6L0zttC3K9naf3VAOeBAyjBiRwm0tWxJC/buhTsKlYrthhyUrwLtYAFL4UHcazvz57hY/cEzR2X6F//9Hp7HFoNtn1E36doX3ZfeI22yxHMo9SYW7O69C45wbhJ29lAA9XXbYVyGBKFkY8C1NCZ0Xckt9H8/Ow5Sz8HmW/NNBJCn0Fsx+jezdGc4ED5naugNbLAyNg=
@@ -68,3 +80,4 @@ env:
     - TEST_NAME='compile-tools'
     - TEST_NAME='native-runs'
     - TEST_NAME='ipv6' BUILD_COOJA=true
+    - TEST_NAME='out-of-tree-build'
diff --git a/tests/19-out-of-tree-build/Makefile b/tests/19-out-of-tree-build/Makefile
new file mode 100644
index 000000000..759027062
--- /dev/null
+++ b/tests/19-out-of-tree-build/Makefile
@@ -0,0 +1,20 @@
+EXAMPLESDIR=$(HOME)/out-of-tree-tests
+TOOLSDIR=$(HOME)/contiki-ng/tools
+
+EXAMPLES = \
+hello-world/native \
+hello-world/native:MAKE_NET=MAKE_NET_NULLNET \
+hello-world/native:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
+hello-world/sky \
+hello-world/nrf52dk \
+hello-world/cc2538dk \
+hello-world/zoul \
+hello-world/openmote-cc2538 \
+hello-world/srf06-cc26xx \
+hello-world/jn516x \
+hello-world/simplelink:BOARD=launchpad/cc26x2r1 \
+hello-world/simplelink:BOARD=sensortag/cc2650 \
+
+TOOLS=
+
+include ../Makefile.compile-test

From 1841aadf6a20ef00a155f72b5b9fb24965a441ae Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 13 Oct 2018 19:59:01 +0100
Subject: [PATCH 11/22] Reduce makefile code duplication

---
 arch/cpu/arm/cortex-m/Makefile.cortex-m | 12 ++++++++++++
 arch/cpu/arm/cortex-m/cm3/Makefile.cm3  | 11 +----------
 arch/cpu/arm/cortex-m/cm4/Makefile.cm4  | 11 -----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/arch/cpu/arm/cortex-m/Makefile.cortex-m b/arch/cpu/arm/cortex-m/Makefile.cortex-m
index aebcf2bdd..36487ef8a 100644
--- a/arch/cpu/arm/cortex-m/Makefile.cortex-m
+++ b/arch/cpu/arm/cortex-m/Makefile.cortex-m
@@ -3,6 +3,18 @@ CONTIKI_ARM_DIRS += cortex-m cortex-m/CMSIS
 ### Build syscalls for newlib
 MODULES += os/lib/newlib
 
+LDFLAGS += -T $(LDSCRIPT)
+LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
+LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
+
+OBJCOPY_FLAGS += --gap-fill 0xff
+
+CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
+
+### Resolve any potential circular dependencies between the linked libraries
+### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
+TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -Wl,--end-group
+
 CUSTOM_RULE_LINK = 1
 
 .SECONDEXPANSION:
diff --git a/arch/cpu/arm/cortex-m/cm3/Makefile.cm3 b/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
index 3cf216bfb..b4bf612da 100644
--- a/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
+++ b/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
@@ -3,16 +3,7 @@ CONTIKI_ARM_DIRS += cortex-m/cm3
 CFLAGS += -mcpu=cortex-m3
 
 LDFLAGS += -mcpu=cortex-m3 -nostartfiles
-LDFLAGS += -T $(LDSCRIPT)
-LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
-LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
 
-OBJCOPY_FLAGS += --gap-fill 0xff
-
-CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
-
-### Resolve any potential circular dependencies between the linked libraries
-### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
-TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -lm -Wl,--end-group
+TARGET_LIBFILES += -lm
 
 include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m
diff --git a/arch/cpu/arm/cortex-m/cm4/Makefile.cm4 b/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
index b0b592e43..7443681ea 100644
--- a/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
+++ b/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
@@ -3,16 +3,5 @@ CONTIKI_ARM_DIRS += cortex-m/cm4
 CFLAGS += -mcpu=cortex-m4
 
 LDFLAGS += -mcpu=cortex-m4
-LDFLAGS += -T $(LDSCRIPT)
-LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
-LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
-
-OBJCOPY_FLAGS += --gap-fill 0xff
-
-CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
-
-### Resolve any potential circular dependencies between the linked libraries
-### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
-TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -Wl,--end-group
 
 include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m

From ab5d5ba33cac0f4c7c5fd2b928b7c611f66fbf7f Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 13 Oct 2018 22:26:22 +0100
Subject: [PATCH 12/22] Extend build verbosity control

Apply verbosity control for mkdir, cp, srec_cat, objcopy, objdump
---
 Makefile.include          | 11 ++++++++++-
 arch/cpu/arm/Makefile.arm | 23 ++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index a194274bd..7d7bef70e 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -77,7 +77,8 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
 
 # Provide way to create $(OBJECTDIR) if it has been removed by make clean
 $(OBJECTDIR):
-	mkdir $@
+	$(TRACE_MKDIR)
+	$(Q)mkdir $@
 
 uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
@@ -241,12 +242,20 @@ ifeq ($(V),1)
   TRACE_LD =
   TRACE_AR =
   TRACE_AS =
+  TRACE_OBJCOPY  =
+  TRACE_OBJDUMP  =
+  TRACE_MKDIR =
+  TRACE_CP =
   Q=
 else
   TRACE_CC = @echo "  CC       " $<
   TRACE_LD = @echo "  LD       " $@
   TRACE_AR = @echo "  AR       " $@
   TRACE_AS = @echo "  AS       " $<
+  TRACE_OBJCOPY  = @echo "  OBJCOPY  " $< "-->" $@
+  TRACE_OBJDUMP  = @echo "  OBJDUMP  " $< "-->" $@
+  TRACE_MKDIR = @echo "  MKDIR    " $@
+  TRACE_CP       = @echo "  CP       " $< "-->" $@
   Q=@
 endif
 
diff --git a/arch/cpu/arm/Makefile.arm b/arch/cpu/arm/Makefile.arm
index 83f9b8a36..e24385f4b 100644
--- a/arch/cpu/arm/Makefile.arm
+++ b/arch/cpu/arm/Makefile.arm
@@ -1,3 +1,11 @@
+### Verbosity control. Use  make V=1 to get verbose builds.
+### Extends what we already have in the top-level Makefile
+ifeq ($(V),1)
+  TRACE_SREC_CAT =
+else
+  TRACE_SREC_CAT = @echo "  SREC_CAT " $< "-->" $@
+endif
+
 CC       = arm-none-eabi-gcc
 CPP      = arm-none-eabi-cpp
 LD       = arm-none-eabi-gcc
@@ -47,18 +55,23 @@ CLEAN += *.elf *.bin *.lst *.hex *.i16hex
 .PRECIOUS: %.elf %.hex %.bin
 
 %.i16hex: %.elf
-	$(OBJCOPY) -O ihex $< $@
+	$(TRACE_OBJCOPY)
+	$(Q)$(OBJCOPY) -O ihex $< $@
 
 %.hex: %.i16hex
-	$(SREC_CAT) $< -intel -o $@ -intel
+	$(TRACE_SREC_CAT)
+	$(Q)$(SREC_CAT) $< -intel -o $@ -intel
 
 %.bin: %.elf
-	$(OBJCOPY) -O binary $(OBJCOPY_FLAGS) $< $@
+	$(TRACE_OBJCOPY)
+	$(Q)$(OBJCOPY) -O binary $(OBJCOPY_FLAGS) $< $@
 
 %.lst: %.elf
-	$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
+	$(TRACE_OBJDUMP)
+	$(Q)$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
 
 ### We don't really need the .hex and .bin for the .$(TARGET) but let's make
 ### sure they get built
 %.$(TARGET): %.elf %.hex %.bin
-	cp $< $@
+	$(TRACE_CP)
+	$(Q)cp $< $@

From f8ea68c3eb39d7de1c28d3ceaa7a2c6896e91b42 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 13 Oct 2018 23:14:51 +0100
Subject: [PATCH 13/22] Change build output dir structure and filenames

---
 Makefile.include                        | 27 ++++++++++++++-----------
 arch/cpu/arm/Makefile.arm               | 19 ++++++++++-------
 arch/cpu/arm/cortex-m/Makefile.cortex-m |  4 +++-
 arch/cpu/nrf52832/Makefile.nrf52832     |  6 +++---
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 7d7bef70e..7d26da821 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -13,8 +13,6 @@ include $(CONTIKI)/Makefile.identify-target
 ### Include Makefile.tools to pull in targets that allow us to build tools dir
 include $(CONTIKI)/Makefile.tools
 
-CONTIKI_NG_TARGET_LIB = contiki-ng-$(TARGET).a
-
 ifeq ($(DEFINES),)
   -include Makefile.$(TARGET).defines
   ifneq ($(DEFINES),)
@@ -39,7 +37,12 @@ ifdef CI
   endif
 endif
 
-OBJECTDIR = obj_$(TARGET)
+BUILD_DIR = build
+BUILD_DIR_TARGET = $(BUILD_DIR)/$(TARGET)
+BUILD_DIR_BOARD = $(BUILD_DIR_TARGET)/$(BOARD)
+OBJECTDIR = $(BUILD_DIR_BOARD)/obj
+
+CONTIKI_NG_TARGET_LIB = $(BUILD_DIR_BOARD)/contiki-ng-$(TARGET).a
 
 LOWERCASE = -abcdefghijklmnopqrstuvwxyz/
 UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ_
@@ -75,11 +78,6 @@ endef
 CONTIKI_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CONTIKI_SOURCEFILES)}}
 PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFILES)}}
 
-# Provide way to create $(OBJECTDIR) if it has been removed by make clean
-$(OBJECTDIR):
-	$(TRACE_MKDIR)
-	$(Q)mkdir $@
-
 uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
 ### Include target makefile (TODO Unsafe?)
@@ -125,6 +123,11 @@ endif # $(BOARD) not empty
 
 PLATFORM_ACTION ?= build
 
+# Provide way to create $(OBJECTDIR) if it has been removed by make clean
+$(OBJECTDIR):
+	$(TRACE_MKDIR)
+	$(Q)mkdir -p $@
+
 ifneq ($(BOARD),)
   TARGET_BOARD_UPPERCASE := ${strip ${shell echo $(BOARD) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
   CFLAGS += -DCONTIKI_BOARD_$(TARGET_BOARD_UPPERCASE)=1
@@ -312,14 +315,13 @@ endef
 
 ### Harmonize filename of a .map file, if the platform's build system wants
 ### to create one
-CONTIKI_NG_PROJECT_MAP = $(addsuffix -$(TARGET).map, $(basename $@))
+CONTIKI_NG_PROJECT_MAP = $(BUILD_DIR_BOARD)/$(basename $(notdir $@)).map
 
 .PHONY: clean distclean usage help targets boards savetarget savedefines viewconf
 
 clean:
-	-$(Q)rm -f *.d *.e *.o $(CONTIKI_NG_TARGET_LIB) $(CLEAN)
-	-$(Q)rm -rf $(OBJECTDIR)
-	-$(Q)rm -f $(addsuffix -$(TARGET).map, $(CONTIKI_PROJECT))
+	-$(Q)rm -f *.d *.e *.o $(CLEAN)
+	-$(Q)rm -rf $(BUILD_DIR_TARGET)
 	-$(Q)rm -f $(addsuffix .$(TARGET), $(CONTIKI_PROJECT))
 	@echo Target $(TARGET) cleaned
 
@@ -328,6 +330,7 @@ distclean:
 		echo Running: $(MAKE) TARGET=$$TARG clean; \
 		$(MAKE) TARGET=$$TARG clean; \
 	done
+	rmdir $(BUILD_DIR)
 
 -include $(CONTIKI)/arch/platform/$(TARGET)/Makefile.customrules-$(TARGET)
 
diff --git a/arch/cpu/arm/Makefile.arm b/arch/cpu/arm/Makefile.arm
index e24385f4b..d378d1132 100644
--- a/arch/cpu/arm/Makefile.arm
+++ b/arch/cpu/arm/Makefile.arm
@@ -51,27 +51,32 @@ endif
 ### CPU-dependent cleanup files
 CLEAN += *.elf *.bin *.lst *.hex *.i16hex
 
-### Don't treat the following files as intermediate
-.PRECIOUS: %.elf %.hex %.bin
+OUT_HEX = $(BUILD_DIR_BOARD)/%.hex
+OUT_I16HEX = $(BUILD_DIR_BOARD)/%.i16hex
+OUT_BIN = $(BUILD_DIR_BOARD)/%.bin
+OUT_LST = $(BUILD_DIR_BOARD)/%.lst
 
-%.i16hex: %.elf
+### Don't treat the following files as intermediate
+.PRECIOUS: $(OUT_ELF) $(OUT_HEX) $(OUT_BIN)
+
+$(OUT_I16HEX): $(OUT_ELF)
 	$(TRACE_OBJCOPY)
 	$(Q)$(OBJCOPY) -O ihex $< $@
 
-%.hex: %.i16hex
+$(OUT_HEX): $(OUT_I16HEX)
 	$(TRACE_SREC_CAT)
 	$(Q)$(SREC_CAT) $< -intel -o $@ -intel
 
-%.bin: %.elf
+$(OUT_BIN): $(OUT_ELF)
 	$(TRACE_OBJCOPY)
 	$(Q)$(OBJCOPY) -O binary $(OBJCOPY_FLAGS) $< $@
 
-%.lst: %.elf
+$(OUT_LST): $(OUT_ELF)
 	$(TRACE_OBJDUMP)
 	$(Q)$(OBJDUMP) $(OBJDUMP_FLAGS) $< > $@
 
 ### We don't really need the .hex and .bin for the .$(TARGET) but let's make
 ### sure they get built
-%.$(TARGET): %.elf %.hex %.bin
+%.$(TARGET): $(OUT_ELF) $(OUT_HEX) $(OUT_BIN)
 	$(TRACE_CP)
 	$(Q)cp $< $@
diff --git a/arch/cpu/arm/cortex-m/Makefile.cortex-m b/arch/cpu/arm/cortex-m/Makefile.cortex-m
index 36487ef8a..0ca1d54ff 100644
--- a/arch/cpu/arm/cortex-m/Makefile.cortex-m
+++ b/arch/cpu/arm/cortex-m/Makefile.cortex-m
@@ -17,9 +17,11 @@ TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -Wl,--end-group
 
 CUSTOM_RULE_LINK = 1
 
+OUT_ELF = $(BUILD_DIR_BOARD)/%.elf
+
 .SECONDEXPANSION:
 
-%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT) $(TARGET_LIBS)
+$(OUT_ELF): $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT) $(TARGET_LIBS)
 	$(TRACE_LD)
 	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFLAGS) -o $@
 
diff --git a/arch/cpu/nrf52832/Makefile.nrf52832 b/arch/cpu/nrf52832/Makefile.nrf52832
index c97c728e5..098033ce4 100644
--- a/arch/cpu/nrf52832/Makefile.nrf52832
+++ b/arch/cpu/nrf52832/Makefile.nrf52832
@@ -172,11 +172,11 @@ vpath %.s $(ASM_PATHS)
 
 OBJECTS = $(C_OBJECTS) $(ASM_OBJECTS)
 
-CLEAN += nrf52832.a
+NRFLIB = $(BUILD_DIR_BOARD)/nrf52832.a
 
-TARGET_LIBS = nrf52832.a $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
+TARGET_LIBS = $(NRFLIB) $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
 
-nrf52832.a: $(OBJECTS)
+$(NRFLIB): $(OBJECTS)
 	$(TRACE_AR)
 	$(Q)$(AR) $(AROPTS) $@ $^
 

From 1b85bc61242f2e793c8c41a17f4f7c3015616037 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sat, 13 Oct 2018 23:15:06 +0100
Subject: [PATCH 14/22] Ignore the new build output dir

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0ff1ebfa2..c80b86fd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@
 *.ihex
 *.pyc
 *~
-obj_*
+build/*
 Makefile.target
 Makefile.*.defines
 tools/doxygen/html

From 6f2f4b4b2371b6027c71860b7a3773a069c34cf4 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sun, 14 Oct 2018 00:23:43 +0100
Subject: [PATCH 15/22] Fix the .upload target

---
 arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx          | 6 +++---
 arch/platform/cc2538dk/Makefile.cc2538dk               | 5 +++--
 arch/platform/openmote-cc2538/Makefile.openmote-cc2538 | 5 +++--
 arch/platform/zoul/Makefile.zoul                       | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index 592ddfbd8..94f4e5111 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -81,8 +81,10 @@ STACK_SIZE = 0
 	@$(SIZE) -A $< | egrep "data|bss" | awk '{s+=$$2} END {s=s+$(STACK_SIZE); f=$(RAM_SIZE)-s; printf "[RAM]   used %6d, free %6d\n",s,f;}'
 	@$(SIZE) -A $< | egrep "text|isr_vector" | awk '{s+=$$2} END {f=$(FLASH_SIZE)-s; printf "[Flash] used %6d, free %6d\n",s,f;}'
 
+include $(CONTIKI)/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
+
 ifeq ($(BOARD_SUPPORTS_BSL),1)
-%.upload: %.bin
+%.upload: $(OUT_BIN)
 ifeq ($(wildcard $(BSL)), )
 	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
 else
@@ -95,5 +97,3 @@ endif
 
 ### For the login etc targets
 BAUDRATE = 115200
-
-include $(CONTIKI)/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
diff --git a/arch/platform/cc2538dk/Makefile.cc2538dk b/arch/platform/cc2538dk/Makefile.cc2538dk
index d80fd8d5f..148c6e837 100644
--- a/arch/platform/cc2538dk/Makefile.cc2538dk
+++ b/arch/platform/cc2538dk/Makefile.cc2538dk
@@ -28,11 +28,12 @@ endif
 
 BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
 
-%.upload: %.bin %.elf
+%.upload: $(OUT_BIN) $(OUT_ELF)
 ifeq ($(wildcard $(BSL)), )
 	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
 else
-	$(eval BSL_ADDRESS_ARG := -a $(shell $(OBJDUMP) -h $*.elf | grep -B1 LOAD | \
+	$(eval BSL_ADDRESS_ARG := -a $(shell $(OBJDUMP) -h \
+	                               $(BUILD_DIR_BOARD)/$*.elf | grep -B1 LOAD | \
 	                               grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$5}' | \
 	                               sort -g | head -1))
 	$(PYTHON) $(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
diff --git a/arch/platform/openmote-cc2538/Makefile.openmote-cc2538 b/arch/platform/openmote-cc2538/Makefile.openmote-cc2538
index d3863fdbc..8b25b0bfe 100644
--- a/arch/platform/openmote-cc2538/Makefile.openmote-cc2538
+++ b/arch/platform/openmote-cc2538/Makefile.openmote-cc2538
@@ -35,11 +35,12 @@ endif
 
 BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
 
-%.upload: %.bin %.elf
+%.upload: $(OUT_BIN) $(OUT_ELF)
 ifeq ($(wildcard $(BSL)), )
 	@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
 else
-	$(eval BSL_ADDRESS_ARG := -a $(shell $(OBJDUMP) -h $*.elf | grep -B1 LOAD | \
+	$(eval BSL_ADDRESS_ARG := -a $(shell $(OBJDUMP) -h \
+	                               $(BUILD_DIR_BOARD)/$*.elf | grep -B1 LOAD | \
 	                               grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$5}' | \
 	                               sort -g | head -1))
 	$(PYTHON) $(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
diff --git a/arch/platform/zoul/Makefile.zoul b/arch/platform/zoul/Makefile.zoul
index 938abe035..e43f84744 100644
--- a/arch/platform/zoul/Makefile.zoul
+++ b/arch/platform/zoul/Makefile.zoul
@@ -69,9 +69,9 @@ endif
 ### $$$$ Double escapes $s that need to be passed to the shell - once for when
 ### make parses UPLOAD_RULE, and once for when the expanded rule is parsed by make.
 define UPLOAD_RULE
-%.$(MOTE): %.bin %.elf
+%.$(MOTE): $(OUT_BIN) $(OUT_ELF)
 	@echo "Flashing $(MOTE)"
-	@BSL_ADDRESS=`$(OBJDUMP) -h $$*.elf | grep -B1 LOAD | \
+	@BSL_ADDRESS=`$(OBJDUMP) -h $(BUILD_DIR_BOARD)/$$*.elf | grep -B1 LOAD | \
 	             grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$$$5}' | \
 	             sort -g | head -1`; \
 	$(PYTHON) $(BSL) $(BSL_FLAGS) -b $(BSL_SPEED) -a $$$${BSL_ADDRESS} -p $(MOTE) $$<

From 8121383950402e614f33dbb667e67cefc9069185 Mon Sep 17 00:00:00 2001
From: George Oikonomou <g.oikonomou@bristol.ac.uk>
Date: Wed, 17 Oct 2018 12:36:52 +0100
Subject: [PATCH 16/22] Update the Cooja submodule to the latest version

---
 tools/cooja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cooja b/tools/cooja
index a5904b983..63538bbb8 160000
--- a/tools/cooja
+++ b/tools/cooja
@@ -1 +1 @@
-Subproject commit a5904b98366478bb9e7f7fe9f0bb78fc064914c5
+Subproject commit 63538bbb882ba06a7b8cf97c11ce2fe4d22e4f88

From 44d3f78b9c77fe2872e4d10feba39e3e6afbbbb8 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sun, 14 Oct 2018 00:29:47 +0100
Subject: [PATCH 17/22] Adjust the Cooja build system to the new build output
 dir structure

---
 arch/platform/cooja/Makefile.cooja             | 8 ++++----
 arch/platform/cooja/Makefile.customrules-cooja | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/platform/cooja/Makefile.cooja b/arch/platform/cooja/Makefile.cooja
index d06aa08d5..6a6a9d49e 100644
--- a/arch/platform/cooja/Makefile.cooja
+++ b/arch/platform/cooja/Makefile.cooja
@@ -34,10 +34,10 @@ endif
 
 endif ## QUICKSTART
 
-#MAIN_SRC = $(OBJECTDIR)/$(LIBNAME).c
-MAIN_OBJ = $(OBJECTDIR)/$(LIBNAME).o
-ARCHIVE = $(OBJECTDIR)/$(LIBNAME).a
-JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET)
+#MAIN_SRC = $(BUILD_DIR_BOARD)/$(LIBNAME).c
+MAIN_OBJ = $(BUILD_DIR_BOARD)/$(LIBNAME).o
+ARCHIVE = $(BUILD_DIR_BOARD)/$(LIBNAME).a
+JNILIB = $(BUILD_DIR_BOARD)/$(LIBNAME).$(TARGET)
 CONTIKI_APP_OBJ = $(CONTIKI_APP).o
 
 ### COOJA platform sources
diff --git a/arch/platform/cooja/Makefile.customrules-cooja b/arch/platform/cooja/Makefile.customrules-cooja
index 42d6e125e..60d6240f1 100644
--- a/arch/platform/cooja/Makefile.customrules-cooja
+++ b/arch/platform/cooja/Makefile.customrules-cooja
@@ -10,11 +10,11 @@ CUSTOM_RULE_LINK=1
 
 REDEF_PRINTF=1 # Redefine functions to enable printf()s inside Cooja
 
-# NB: Assumes ARCHIVE was not overridden and is in $(OBJECTDIR)
+# NB: Assumes ARCHIVE was not overridden and is in $(BUILD_DIR_BOARD)
 $(ARCHIVE): $(CONTIKI_OBJECTFILES) | $(OBJECTDIR)
 	$(AR_COMMAND_1) $^ $(AR_COMMAND_2)
 
-# NB: Assumes JNILIB was not overridden and is in $(OBJECTDIR)
+# NB: Assumes JNILIB was not overridden and is in $(BUILD_DIR_BOARD)
 $(JNILIB): $(CONTIKI_APP_OBJ) $(MAIN_OBJ) $(PROJECT_OBJECTFILES) $(ARCHIVE) | $(OBJECTDIR)
 
 ifdef REDEF_PRINTF

From 0622889add62f0a230db1ecd6f1b1ce68d556e5b Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Thu, 18 Oct 2018 20:14:48 +0100
Subject: [PATCH 18/22] Allow users to specify build configurations

---
 Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.include b/Makefile.include
index 7d26da821..1ebe8f582 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -39,7 +39,7 @@ endif
 
 BUILD_DIR = build
 BUILD_DIR_TARGET = $(BUILD_DIR)/$(TARGET)
-BUILD_DIR_BOARD = $(BUILD_DIR_TARGET)/$(BOARD)
+BUILD_DIR_BOARD = $(BUILD_DIR_TARGET)/$(BOARD)/$(BUILD_DIR_CONFIG)
 OBJECTDIR = $(BUILD_DIR_BOARD)/obj
 
 CONTIKI_NG_TARGET_LIB = $(BUILD_DIR_BOARD)/contiki-ng-$(TARGET).a

From d89cca83acded3ce51045efd0eb8c550ac2a48a7 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Tue, 23 Oct 2018 16:49:54 +0100
Subject: [PATCH 19/22] Don't generate an error if build/ does not exist

---
 Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.include b/Makefile.include
index 1ebe8f582..3c9058c9e 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -330,7 +330,7 @@ distclean:
 		echo Running: $(MAKE) TARGET=$$TARG clean; \
 		$(MAKE) TARGET=$$TARG clean; \
 	done
-	rmdir $(BUILD_DIR)
+	-$(Q)rm -rf $(BUILD_DIR)
 
 -include $(CONTIKI)/arch/platform/$(TARGET)/Makefile.customrules-$(TARGET)
 

From 14eeeccebca59bb9ce2f892bc927c90ca5e8b4af Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Tue, 23 Oct 2018 17:45:43 +0100
Subject: [PATCH 20/22] Always create example.$(TARGET) under build/ and then
 copy to .

---
 Makefile.include          | 12 ++++++++----
 arch/cpu/arm/Makefile.arm |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 3c9058c9e..672c7f4c1 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -395,12 +395,16 @@ ifndef LD
 endif
 
 ifndef CUSTOM_RULE_LINK
-%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB)
+$(BUILD_DIR_BOARD)/%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB)
 	$(TRACE_LD)
 	$(Q)$(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} \
 	    ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
 endif
 
+%.$(TARGET): $(BUILD_DIR_BOARD)/%.$(TARGET)
+	$(TRACE_CP)
+	$(Q)cp $< $@
+
 %.ramprof: %.$(TARGET)
 	$(NM) -S -td --size-sort $< | grep -i " [abdrw] " | cut -d' ' -f2,4
 
@@ -458,9 +462,9 @@ ifeq ($(findstring $(TARGET),native cooja),)
   include $(CONTIKI)/Makefile.embedded
 endif
 
-# Don't treat %.$(TARGET) as an intermediate file because it is
-# in fact the primary target.
-.PRECIOUS: %.$(TARGET)
+# Don't treat $(BUILD_DIR_BOARD)/%.$(TARGET) and $(TARGET) as intermediate
+# files because for many platforms they are in fact the primary target.
+.PRECIOUS: $(BUILD_DIR_BOARD)/%.$(TARGET) %.$(TARGET)
 
 # Cancel the predefined implict rule for compiling and linking
 # a single C source into a binary to force GNU make to consider
diff --git a/arch/cpu/arm/Makefile.arm b/arch/cpu/arm/Makefile.arm
index d378d1132..e8befdb86 100644
--- a/arch/cpu/arm/Makefile.arm
+++ b/arch/cpu/arm/Makefile.arm
@@ -77,6 +77,6 @@ $(OUT_LST): $(OUT_ELF)
 
 ### We don't really need the .hex and .bin for the .$(TARGET) but let's make
 ### sure they get built
-%.$(TARGET): $(OUT_ELF) $(OUT_HEX) $(OUT_BIN)
+$(BUILD_DIR_BOARD)/%.$(TARGET): $(OUT_ELF) $(OUT_HEX) $(OUT_BIN)
 	$(TRACE_CP)
 	$(Q)cp $< $@

From 1dc02498369470c810ed0cef110ccb399c562014 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Tue, 23 Oct 2018 17:45:59 +0100
Subject: [PATCH 21/22] Adjust the jn516x build system to the new build output
 dir structure

---
 arch/platform/jn516x/Makefile.jn516x | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/arch/platform/jn516x/Makefile.jn516x b/arch/platform/jn516x/Makefile.jn516x
index 9ad9488d5..051c336fb 100644
--- a/arch/platform/jn516x/Makefile.jn516x
+++ b/arch/platform/jn516x/Makefile.jn516x
@@ -229,30 +229,34 @@ ALLLIBS = $(addprefix -l,$(LDLIBS)) $(addprefix -l,$(LDSTACKLIBS)) $(addprefix -
 ABS_APPLIBS = $(addsuffix _$(JENNIC_CHIP_FAMILY).a,$(addprefix $(COMPONENTS_BASE_DIR)/Library/lib,$(APPLIBS)))
 
 ifneq ($(wildcard $(SDK_BASE_DIR)/Components/Library/*),)
-# The SDK is fully installed, proceed to linking and objcopy to ready-to-upload .jn516x.bin file
-%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB) $(ABS_APPLIBS)
-	echo  ${filter %.a,$^}
+# The SDK is fully installed, proceed to linking
+$(BUILD_DIR_BOARD)/%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB) $(ABS_APPLIBS)
+	@echo  ${filter %.a,$^}
 	$(Q)$(CC) -Wl,--gc-sections $(LDFLAGS) -T$(LINKCMD) -o $@ -Wl,--start-group \
 	  $(patsubst /cygdrive/c/%,c:/%,${filter-out %.a,$^}) \
 	  $(patsubst /cygdrive/c/%,c:/%,${filter %.a,$^}) \
 	  $(ALLLIBS) -Wl,--end-group -Wl,-Map,$(CONTIKI_NG_PROJECT_MAP)
-	$(OBJCOPY) -S -O binary $@ $@.bin
 else
 # The SDK does not include libraries, only build objects and libraries, skip linking
-%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB)
-	echo Creating empty $@
+$(BUILD_DIR_BOARD)/%.$(TARGET): %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB)
+	@echo Creating empty $@
 	touch $@
 endif
 
-%.$(TARGET).bin: %.$(TARGET)
+$(BUILD_DIR_BOARD)/%.$(TARGET).bin: $(BUILD_DIR_BOARD)/%.$(TARGET)
+	$(TRACE_OBJCOPY)
 	$(Q)$(OBJCOPY) -S -O binary $< $@
 
+%.$(TARGET).bin: $(BUILD_DIR_BOARD)/%.$(TARGET).bin
+	$(TRACE_CP)
+	$(Q)$(CP) $< $@
+
 ### Upload target to one jn516x mote specified by MOTE=portNumber
 ifeq ($(HOST_OS),Windows)
-%.upload: %.$(TARGET).bin
+%.upload: $(BUILD_DIR_BOARD)/%.$(TARGET).bin
 	${FLASH_PROGRAMMER} -a -c $(DEV_PORT) -B 1000000 -s -w -f $<
 else
-%.upload: %.$(TARGET).bin
+%.upload: $(BUILD_DIR_BOARD)/%.$(TARGET).bin
 	${FLASH_PROGRAMMER} -V 10 -v -s $(DEV_PORT) -I 38400 -P 1000000 -f $<
 endif
 
@@ -276,7 +280,7 @@ motelistinfo:
 	$(Q)$(MOTELIST) ${FLASH_PROGRAMMER} \?
 
 ### Upload target to all connected jn516x motes
-%.uploadall: %.$(TARGET).bin
+%.uploadall: $(BUILD_DIR_BOARD)/%.$(TARGET).bin
 	$(Q)$(MOTELIST) ${FLASH_PROGRAMMER} $<
 
 ### Flash the given file to all connected jn516x motes

From 5d8fda2af49eb58420d08e1c09f87baee8853c2d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Mon, 5 Nov 2018 14:35:06 +0100
Subject: [PATCH 22/22] Native border router: clearer error messages

---
 os/services/rpl-border-router/native/slip-dev.c   | 2 +-
 os/services/rpl-border-router/native/tun-bridge.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/os/services/rpl-border-router/native/slip-dev.c b/os/services/rpl-border-router/native/slip-dev.c
index 7ea764836..3ccd1db4b 100644
--- a/os/services/rpl-border-router/native/slip-dev.c
+++ b/os/services/rpl-border-router/native/slip-dev.c
@@ -562,7 +562,7 @@ slip_init(void)
   slip_send(slipfd, SLIP_END);
   inslip = fdopen(slipfd, "r");
   if(inslip == NULL) {
-    err(1, "main: fdopen");
+    err(1, "slip_init: fdopen");
   }
 }
 /*---------------------------------------------------------------------------*/
diff --git a/os/services/rpl-border-router/native/tun-bridge.c b/os/services/rpl-border-router/native/tun-bridge.c
index f321577b3..289a32185 100644
--- a/os/services/rpl-border-router/native/tun-bridge.c
+++ b/os/services/rpl-border-router/native/tun-bridge.c
@@ -210,7 +210,7 @@ tun_init()
   tunfd = tun_alloc(slip_config_tundev);
 
   if(tunfd == -1) {
-    err(1, "main: open");
+    err(1, "tun_init: open");
   }
 
   select_set_callback(tunfd, &tun_select_callback);