From 9e8fa3a733343aca15d1adce1a7bce7ac8e2eb0d Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Tue, 5 May 2020 12:58:57 +0200 Subject: [PATCH 1/6] update to Ubuntu 2020.04 LTS --- riotbuild/Dockerfile | 16 +++++++++++----- riotdocker-base/Dockerfile | 2 +- static-test-tools/Dockerfile | 10 ++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index 4995b5e2..991a6b5a 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -26,6 +26,14 @@ LABEL maintainer="Kaspar Schleiser " ENV DEBIAN_FRONTEND noninteractive +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + +# copy some included packages +RUN mkdir /pkgs +COPY files/libsocketcan-dev_0.0.11-1_i386.deb /pkgs/libsocketcan-dev_0.0.11-1_i386.deb +COPY files/libsocketcan2_0.0.11-1_i386.deb /pkgs/libsocketcan2_0.0.11-1_i386.deb + # The following package groups will be installed: # - update the package index files to latest available version # - native platform development and build system functionality (about 400 MB installed) @@ -103,12 +111,10 @@ RUN \ # Filter by symlinks starting with /usr/bin/llvm-${LLVM_VERSION} case "${SYMTARGET}" in "/usr/lib/llvm-${LLVM_VERSION}"* ) ln -sf ${SYMTARGET} ${SYMNAME}; esac \ done \ - && echo 'Installing socketCAN' >&2 && \ - apt-get -y --no-install-recommends install \ - libsocketcan-dev:i386 \ - libsocketcan2:i386 \ + && echo 'Installing local packages' >&2 && \ + apt install -y --no-install-recommends /pkgs/*.deb \ && echo 'Cleaning up installation files' >&2 && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /pkgs # Install ARM GNU embedded toolchain # For updates, see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads diff --git a/riotdocker-base/Dockerfile b/riotdocker-base/Dockerfile index aa3ce6de..31867b36 100644 --- a/riotdocker-base/Dockerfile +++ b/riotdocker-base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:focal LABEL maintainer="Kaspar Schleiser " diff --git a/static-test-tools/Dockerfile b/static-test-tools/Dockerfile index ded71812..cc069ae1 100644 --- a/static-test-tools/Dockerfile +++ b/static-test-tools/Dockerfile @@ -8,12 +8,15 @@ ENV DEBIAN_FRONTEND noninteractive ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 +# copy some included packages +RUN mkdir /pkgs +COPY files/coccinelle_1.0.8~19.04npalix1_amd64.deb /pkgs/coccinelle_1.0.8~19.04npalix1_amd64.deb + RUN \ echo 'Update the package index files to latest available versions' >&2 && \ apt-get update && \ echo 'Installing static test tools' >&2 && \ apt-get -y --no-install-recommends install \ - coccinelle \ cppcheck \ doxygen \ graphviz \ @@ -25,8 +28,11 @@ RUN \ vera++ \ wget \ && \ + echo 'Installing local packages' >&2 && \ + apt install -y --no-install-recommends /pkgs/*.deb \ + && \ echo 'Cleaning up installation files' >&2 && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /pkgs # Install required Python packages COPY requirements.txt /tmp/requirements.txt From 2a9cd20ecc76c4b810be1f3e3471e0e8e13d3c4d Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Mon, 6 Sep 2021 10:55:48 +0200 Subject: [PATCH 2/6] riotbuild: drop "/bionic-updates" for llvm packages --- riotbuild/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index 991a6b5a..ad011a51 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -94,9 +94,9 @@ RUN \ avr-libc \ && echo 'Installing LLVM/Clang toolchain' >&2 && \ apt-get -y --no-install-recommends install \ - llvm-${LLVM_VERSION}/bionic-updates \ - clang-${LLVM_VERSION}/bionic-updates \ - clang-tools-${LLVM_VERSION}/bionic-updates \ + llvm-${LLVM_VERSION} \ + clang-${LLVM_VERSION} \ + clang-tools-${LLVM_VERSION} \ llvm \ clang \ clang-tools \ From 66a18221384bf414eeffd6b9ee2e0339bbdb59e1 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 29 Oct 2021 08:58:51 +0200 Subject: [PATCH 3/6] static-test-tools: add coccinelle package --- .../files/coccinelle_1.0.8~19.04npalix1_amd64.deb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb diff --git a/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb b/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb new file mode 100644 index 00000000..e8537604 --- /dev/null +++ b/static-test-tools/files/coccinelle_1.0.8~19.04npalix1_amd64.deb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d929e93039deec2d04847f3e6b69916e66c1b8256816ad7dd01fca13db34b7 +size 5343420 From e5d2d2dcc4a8a2df615df0707318d891bd5c2803 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 29 Oct 2021 08:59:36 +0200 Subject: [PATCH 4/6] riotbuild: add libsocketcan package files --- riotbuild/files/libsocketcan-dev_0.0.11-1_i386.deb | 3 +++ riotbuild/files/libsocketcan2_0.0.11-1_i386.deb | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 riotbuild/files/libsocketcan-dev_0.0.11-1_i386.deb create mode 100644 riotbuild/files/libsocketcan2_0.0.11-1_i386.deb diff --git a/riotbuild/files/libsocketcan-dev_0.0.11-1_i386.deb b/riotbuild/files/libsocketcan-dev_0.0.11-1_i386.deb new file mode 100644 index 00000000..f3b17116 --- /dev/null +++ b/riotbuild/files/libsocketcan-dev_0.0.11-1_i386.deb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e5d32040edb35388f4492ea4db10a00010e942a2139a20ede0b1e4d2e027e2f +size 7588 diff --git a/riotbuild/files/libsocketcan2_0.0.11-1_i386.deb b/riotbuild/files/libsocketcan2_0.0.11-1_i386.deb new file mode 100644 index 00000000..866c3b06 --- /dev/null +++ b/riotbuild/files/libsocketcan2_0.0.11-1_i386.deb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5af122fcd407c139b83c283474c391a366e48c0648a190f621db2dc61f161ed5 +size 8172 From b7d3caf6254189ab9f26c1416e9cfd9c6b76c2e4 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 29 Oct 2021 09:01:16 +0200 Subject: [PATCH 5/6] .gitattributes: initial commit, lfs for `*.deb` --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3a19b956 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.deb filter=lfs diff=lfs merge=lfs -text From 7ce5232a1a3b65bd198cd91f75101df945909b28 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 29 Oct 2021 09:04:12 +0200 Subject: [PATCH 6/6] .github/workflows/build.yml: add `lfs: true` to version tag --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00251a51..801ee62f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1