From 70f7debc272c912191ccc3ba4358e0034df672ab Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Mon, 26 Oct 2020 08:20:00 +0100
Subject: [PATCH 1/3] Dockerfile: update picolibc to 1.4.7

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1deef838..59f6b58e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -232,7 +232,7 @@ RUN echo 'Installing ESP32 toolchain' >&2 && \
 ENV PATH $PATH:/opt/esp/xtensa-esp32-elf/bin
 
 ARG PICOLIBC_REPO=https://github.com/keith-packard/picolibc
-ARG PICOLIBC_TAG=1.4.6
+ARG PICOLIBC_TAG=1.4.7
 ARG PICOLIBC_URL=${PICOLIBC_REPO}/archive/${PICOLIBC_TAG}.tar.gz
 ARG PICOLIBC_ARCHIVE=${PICOLIBC_TAG}.tar.gz
 
@@ -254,10 +254,10 @@ RUN cd /usr/src/picolibc/picolibc-${PICOLIBC_TAG} && \
     meson .. -Dtests=true -Dmultilib=false -Dincludedir=picolibc/riscv-none-embed/include -Dlibdir=picolibc/riscv-none-embed/lib --cross-file ../cross-riscv-none-embed.txt && \
     ninja && ninja install && \
     cd ../build-esp32 && \
-    sh ../do-esp32-configure && \
+    sh ../scripts/do-esp32-configure && \
     ninja && ninja install && \
     cd ../build-arm && \
-    sh ../do-arm-configure && \
+    sh ../scripts/do-arm-configure && \
     ninja && ninja install
 
 # No need to keep the sources around

From 292a3cb456bce3a31aca071e3d93c83817eff094 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Tue, 27 Oct 2020 11:35:13 +0100
Subject: [PATCH 2/3] travis: build-test nucleo-l011k4

The nucleo-l011k4 is our smallest board and also a board that defaults
to using picolibc.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1ecae841..910c1829 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ script:
   - git clone --depth 1 https://github.com/RIOT-OS/RIOT -b ${RIOT_BRANCH}
   - DOCKER_IMAGE=riotdocker:latest
     BUILD_IN_DOCKER=1
-    BOARDS="arduino-uno esp32-wroom-32 hifive1 msb-430h native pic32-wifire samr21-xpro"
+    BOARDS="arduino-uno esp32-wroom-32 hifive1 msb-430h native pic32-wifire samr21-xpro nucleo-l011k4"
     make -CRIOT/examples/hello-world buildtest
   - DOCKER_IMAGE=riotdocker:latest
     TOOLCHAIN=llvm

From 6a181e27c295867ea91a20b4eab433ac44d59d16 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Fri, 8 Jan 2021 08:13:31 +0100
Subject: [PATCH 3/3] fixup! Dockerfile: update picolibc to 1.4.7

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

diff --git a/Dockerfile b/Dockerfile
index 59f6b58e..574db534 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -232,7 +232,7 @@ RUN echo 'Installing ESP32 toolchain' >&2 && \
 ENV PATH $PATH:/opt/esp/xtensa-esp32-elf/bin
 
 ARG PICOLIBC_REPO=https://github.com/keith-packard/picolibc
-ARG PICOLIBC_TAG=1.4.7
+ARG PICOLIBC_TAG=1.5.1
 ARG PICOLIBC_URL=${PICOLIBC_REPO}/archive/${PICOLIBC_TAG}.tar.gz
 ARG PICOLIBC_ARCHIVE=${PICOLIBC_TAG}.tar.gz