Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circleci/android/arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM $IMAGE_NAME
LABEL authors="Hajime Tazaki <thehajime@gmail.com>, Octavian Purdila <tavi@cs.pub.ro>"

# install toolchain from NDK
RUN ./android-ndk-r15b/build/tools/make_standalone_toolchain.py --arch arm64 --api 23 --install-dir ./aarch64-linux-android && \
RUN ./android-ndk-r15b/build/tools/make_standalone_toolchain.py --arch arm64 --api 24 --install-dir ./aarch64-linux-android && \
rm -rf android-ndk-r15b

# update toolchain, see https://github.com/lkl/linux/issues/348#issuecomment-312409409
Expand Down
2 changes: 1 addition & 1 deletion circleci/x86_64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FROM $IMAGE_NAME
LABEL authors="Hajime Tazaki <thehajime@gmail.com>, Octavian Purdila <tavi@cs.pub.ro>"

RUN sudo apt-get update && \
sudo apt-get install -y libfuse-dev libarchive-dev linux-headers-4.4.0-97-generic valgrind libnuma-dev && \
sudo apt-get install -y libfuse-dev libarchive-dev linux-headers-generic valgrind libnuma-dev && \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lklfuse recently moved to libfuse3 - I'm not sure about Ubuntu / Debian, but I think we should add libfuse3-dev here. libfuse-dev could then be dropped

sudo rm -rf /var/lib/apt/lists/*