From 6f6a331152f23f056e68eec03adea1173a77982a Mon Sep 17 00:00:00 2001 From: philippd Date: Thu, 21 Mar 2024 21:21:21 +0100 Subject: [PATCH] obsw docker compile not fully working yet --- README.md | 18 +++++++++++++----- docker/compile_fsbl/embeddedsw | 1 - docker/compile_obsw/Dockerfile | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) delete mode 160000 docker/compile_fsbl/embeddedsw create mode 100644 docker/compile_obsw/Dockerfile diff --git a/README.md b/README.md index 6b28ae6..f06a96b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ # Build with Docker +##### Info +IRS wireguard VPN can cause network issues with docker. ##### Install Docker https://www.docker.com/get-started/ -### FSBL +## FSBL ##### Clone the repository and build the docker image: @@ -13,7 +15,6 @@ cd docker/compile_fsbl/ git clone https://github.com/Xilinx/embeddedsw/ docker build -t compile_fsbl . ``` -docker build might fail because of firewall settings or the IRS wireguard VPN. ##### To build the FSBL, run the following command in the `docker/compile-fsbl` directory: @@ -26,7 +27,7 @@ If you want, copy the FSBL.elf to the docker/compile_fsbl directory for easier a cp embeddedsw/lib/sw_apps/zynq_fsbl/src/fsbl.elf . ``` -### mission_rust +## mission_rust (not yet working) ```sh cd docker/compile_mission/ docker build -t compile_mission . @@ -36,7 +37,16 @@ docker build -t compile_mission . ```sh docker run -v $(pwd)/../../mission_rust:/mission_rust compile_mission /bin/bash -c "cargo build -Z build-std" ``` +## obsw +```sh +cd docker/compile_obsw/ +docker build -t compile_obsw . +``` +##### To build the obsw, run the following command in the `docker/compile_obsw` directory: +```sh +docker run -v $(pwd)/../../:/obsw compile_obsw /bin/bash -c "mkdir -p build_cli && cd build_cli && cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain . && make -j 8" +``` # Non-Docker suff @@ -61,8 +71,6 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain .. make -j 4 // or as much threads as your CPU has ``` - - # Debugging on zedboard Requirements [TBC]: diff --git a/docker/compile_fsbl/embeddedsw b/docker/compile_fsbl/embeddedsw deleted file mode 160000 index 3728f54..0000000 --- a/docker/compile_fsbl/embeddedsw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3728f546f178a1bcd91cf6efc9f8921447846cec diff --git a/docker/compile_obsw/Dockerfile b/docker/compile_obsw/Dockerfile new file mode 100644 index 0000000..c8105a6 --- /dev/null +++ b/docker/compile_obsw/Dockerfile @@ -0,0 +1,15 @@ +FROM debian:12.5 + +ENV DEBIAN_FRONTEND=noninteractive + +# Install required packages +RUN apt-get update && apt-get install -y \ + make \ + cmake \ + gcc-arm-none-eabi \ + && rm -rf /var/lib/apt/lists/* + # Remove the package lists to reduce the image size + + +WORKDIR /obsw/ +