From cf54fc19c85027e72ddba6417a07018859bf495b Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 19:48:28 +0100 Subject: [PATCH 1/9] SRecord 1.65 --- Dockerfile | 19 ++++++++++++++++--- README.md | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b41a30..c9a39a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,29 +9,42 @@ RUN apt-get install -y \ build-essential \ git \ curl \ - wget + wget \ + boost-dev \ + libtool + +# Install SRecord +ARG srecord_version="1.65" + +WORKDIR / +RUN wget https://sourceforge.net/projects/srecord/files/srecord/${srecord_version}/srecord-${srecord_version}.tar.gz +RUN tar -xf srecord-${srecord_version}.tar.gz --directory /opt/srecord +WORKDIR /opt/srecord/srecord-${srecord_version} +RUN ./configure --without-gcrypt && make all-bin && make install-bin install-libdir install-include # Install CMake ARG cmake_version="3.28.1" ARG cmake_platform="linux-x86_64" +WORKDIR / RUN mkdir /opt/cmake RUN wget https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-${cmake_platform}.sh RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-license ENV PATH "$PATH:/opt/cmake/bin" # Install Python +WORKDIR / RUN apt-get install -y python3.11 RUN echo 'alias python="python3.11"' >> ~/.bashrc RUN echo 'alias python3="python3.11"' >> ~/.bashrc -# ARM GCC configuration +# Install ARM GCC ARG arm_archive="13.2.rel1" ARG arm_version="13.2.rel1" ARG arm_folder="13.2.Rel1" ARG arm_platform="x86_64-arm-none-eabi" -# Install ARM GCC +WORKDIR / RUN mkdir /opt/armgcc RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/${arm_archive}/binrel/arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz RUN tar -xf arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz --directory /opt/armgcc diff --git a/README.md b/README.md index fefd0f5..e6a47fa 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ + Python 3.11.4 + GCC 9.0 + ARM GCC 13.2-rel1 ++ SRecord 1.65 --- From fe9cfee585c5d73948d486f079865d627d757178 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 19:51:10 +0100 Subject: [PATCH 2/9] libboost? --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c9a39a5..d899a0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get install -y \ git \ curl \ wget \ - boost-dev \ + libboost-all-dev \ libtool # Install SRecord From 65fb2c9796997700774226d618b641b676552643 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 19:59:48 +0100 Subject: [PATCH 3/9] New url --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d899a0c..0f7736e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get install -y \ ARG srecord_version="1.65" WORKDIR / -RUN wget https://sourceforge.net/projects/srecord/files/srecord/${srecord_version}/srecord-${srecord_version}.tar.gz +RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Source.tar.gz RUN tar -xf srecord-${srecord_version}.tar.gz --directory /opt/srecord WORKDIR /opt/srecord/srecord-${srecord_version} RUN ./configure --without-gcrypt && make all-bin && make install-bin install-libdir install-include From 13ed21d4fa33ebfa892fc2b25ee40535627061f3 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 20:38:55 +0100 Subject: [PATCH 4/9] Fix tarball path [skip ci] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f7736e..ee06ef5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG srecord_version="1.65" WORKDIR / RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Source.tar.gz -RUN tar -xf srecord-${srecord_version}.tar.gz --directory /opt/srecord +RUN tar -xf srecord-${srecord_version}.0-Source.tar.gz --directory /opt/srecord WORKDIR /opt/srecord/srecord-${srecord_version} RUN ./configure --without-gcrypt && make all-bin && make install-bin install-libdir install-include From 5177ea69955c56e5ce9bf9a73cad988120a21db2 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 20:51:11 +0100 Subject: [PATCH 5/9] Install from deb [skip ci] --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee06ef5..07ba9fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,9 @@ RUN apt-get install -y \ ARG srecord_version="1.65" WORKDIR / -RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Source.tar.gz -RUN tar -xf srecord-${srecord_version}.0-Source.tar.gz --directory /opt/srecord -WORKDIR /opt/srecord/srecord-${srecord_version} -RUN ./configure --without-gcrypt && make all-bin && make install-bin install-libdir install-include +RUN mkdir /opt/srecord +RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Linux.deb +RUN apt-get install -y srecord-${srecord_version}.0-Linux.deb # Install CMake ARG cmake_version="3.28.1" From 1dbf2518e05f021f91525ba82c81d41e5fea07cb Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 20:54:38 +0100 Subject: [PATCH 6/9] dpkg install [skip ci] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07ba9fb..23c78b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ARG srecord_version="1.65" WORKDIR / RUN mkdir /opt/srecord RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Linux.deb -RUN apt-get install -y srecord-${srecord_version}.0-Linux.deb +RUN dpkg -i ./srecord-${srecord_version}.0-Linux.deb && apt-get install -f # Install CMake ARG cmake_version="3.28.1" From f7ed48484141577251aef9b33d6ce6a461fcfde8 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 20:56:17 +0100 Subject: [PATCH 7/9] apt install [skip ci] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 23c78b4..a0567e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ARG srecord_version="1.65" WORKDIR / RUN mkdir /opt/srecord RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Linux.deb -RUN dpkg -i ./srecord-${srecord_version}.0-Linux.deb && apt-get install -f +RUN apt install ./srecord-${srecord_version}.0-Linux.deb # Install CMake ARG cmake_version="3.28.1" From e97f1ff561c6cd5466663476f7f0e1be3c399bc6 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 20:56:52 +0100 Subject: [PATCH 8/9] apt install yes [skip ci] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0567e3..92e0630 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ARG srecord_version="1.65" WORKDIR / RUN mkdir /opt/srecord RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Linux.deb -RUN apt install ./srecord-${srecord_version}.0-Linux.deb +RUN apt install -y ./srecord-${srecord_version}.0-Linux.deb # Install CMake ARG cmake_version="3.28.1" From 5ca2e3fe0ead79986c71e4a70d121facda7e4aa0 Mon Sep 17 00:00:00 2001 From: Balazs Eszes Date: Wed, 31 Jan 2024 21:07:13 +0100 Subject: [PATCH 9/9] Fixed --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92e0630..ed56554 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ RUN apt-get install -y \ ARG srecord_version="1.65" WORKDIR / -RUN mkdir /opt/srecord RUN wget https://downloads.sourceforge.net/project/srecord/srecord/${srecord_version}/srecord-${srecord_version}.0-Linux.deb RUN apt install -y ./srecord-${srecord_version}.0-Linux.deb