From 5de32f5d1803fc0f86b9fccdc268cc1d10a4b3ff Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Thu, 26 Nov 2020 14:20:49 +0000 Subject: [PATCH] feat(common): add newer cmake (from buster-backports) Required by ZMK cmake boilerplate additions, namely list(PREPEND) which was introduced in cmake 3.15.x --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb17b18..ee9cdec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN \ apt-get -y update \ && apt-get -y install --no-install-recommends \ ccache \ - cmake \ file \ gcc \ gcc-multilib \ @@ -25,6 +24,10 @@ RUN \ python3-pip \ python3-setuptools \ python3-wheel \ + && echo deb http://deb.debian.org/debian buster-backports main >> /etc/apt/sources.list \ + && apt-get -y update \ + && apt-get -y -t buster-backports install --no-install-recommends \ + cmake \ && pip3 install \ -r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/v${ZEPHYR_VERSION}/scripts/requirements-base.txt \ && apt-get remove -y --purge \ @@ -32,7 +35,8 @@ RUN \ python3-setuptools \ python3-wheel \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && cmake --version #------------------------------------------------------------------------------