Merge pull request #20 from pepepr08/fix-15-use-new-rtems-repo

Fix #15, Update links to RTEMS repo

Author: dzbaker

rtems-4.11/Dockerfile

@@ -5,25 +5,24 @@ ENV DEBIAN_FRONTEND=noninteractive
 run apt-get update && apt-get install -y git make curl
 
 # rtems dependencies
-run apt-get install -y flex bison texinfo python-dev g++ unzip
+run apt-get install -y flex bison texinfo python-dev g++ unzip libgmp-dev libmpfr-dev
 
 # QEMU dependencies
 run apt-get install -y qemu-system-i386
 
 # setup and compile RTEMS BSP
 run mkdir -p ${HOME}/rtems-4.11 \
   && cd ${HOME} \
-  && git clone -b 4.11 git://git.rtems.org/rtems-source-builder.git \
+  && git clone -b 4.11 https://gitlab.rtems.org/rtems/tools/rtems-source-builder.git \
   && cd rtems-source-builder/rtems \
-  
 # Download gnu mpc before source builder will fail to download it
   && mkdir sources \
   && curl https://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz --output sources/mpc-1.0.3.tar.gz \
   && ../source-builder/sb-set-builder --prefix=$HOME/rtems-4.11 4.11/rtems-i386 \
 
 # clone and bootstrap RTEMS source tree
   && cd ${HOME} \
-  && git clone -b 4.11 git://git.rtems.org/rtems.git \
+  && git clone -b 4.11 https://gitlab.rtems.org/rtems/rtos/rtems.git \
   && export PATH=$HOME/rtems-4.11/bin:$PATH \
   && cd rtems && ./bootstrap \
 
@@ -65,5 +64,6 @@ run tar -zxf dosfstools.tar.gz && rm dosfstools.tar.gz
 run cd dosfstools-* && ./configure && make && make prefix=/usr/local install
 
 # Remove unecessary dependencies now that rtems is built
-run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl
+run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl \
+  libgmp-dev libmpfr-dev
 run apt-get autoremove -y

rtems-5/Dockerfile

@@ -5,20 +5,23 @@ ENV DEBIAN_FRONTEND=noninteractive
 run apt-get update && apt-get install -y git make
 
 # rtems dependencies
-run apt-get install -y flex bison texinfo python-dev g++ unzip
+run apt-get install -y flex bison texinfo python3-dev g++ unzip libgmp-dev libmpfr-dev bzip2 xz-utils
+
+# Make python3 the default python
+run ln -s /usr/bin/python3 /usr/bin/python
 
 # QEMU dependencies
 run apt-get install -y qemu-system-i386
 
 # setup and compile RTEMS BSP
 run mkdir -p ${HOME}/rtems-5 \
   && cd ${HOME} \
-  && git clone -b 5 git://git.rtems.org/rtems-source-builder.git \
+  && git clone -b 5 https://gitlab.rtems.org/rtems/tools/rtems-source-builder.git \
   && cd rtems-source-builder/rtems \
   && ../source-builder/sb-set-builder --prefix=$HOME/rtems-5 5/rtems-i386 \
 # clone and bootstrap RTEMS source tree
   && cd ${HOME} \
-  && git clone -b 5 git://git.rtems.org/rtems.git \
+  && git clone -b 5 https://gitlab.rtems.org/rtems/rtos/rtems.git \
   && export PATH=$HOME/rtems-5/bin:$PATH \
   && cd rtems && ./bootstrap \
 # Build and install RTEMS pc686 BSP
@@ -54,5 +57,6 @@ run tar -zxf dosfstools.tar.gz && rm dosfstools.tar.gz
 run cd dosfstools-* && ./configure && make && make prefix=/usr/local install
 
 # Remove unecessary dependencies now that rtems is built
-run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl
+run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl \
+  libgmp-dev libmpfr-dev bzip2 xz-utils
 run apt-get autoremove -y

rtems-6/Dockerfile

@@ -5,7 +5,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 run apt-get update && apt-get install -y git make
 
 # rtems dependencies
-run apt-get install -y flex bison texinfo python-dev g++ unzip
+run apt-get install -y flex bison texinfo python3-dev g++ unzip libgmp-dev libmpfr-dev bzip2 xz-utils
+
+# Make python3 the default python
+run ln -s /usr/bin/python3 /usr/bin/python
 
 # Added: Python development package installation for RTEMS build dependencies
 run apt-get install -y python3-dev libpython3-dev
@@ -19,34 +22,30 @@ copy rtems-6/config.ini /config.ini
 # Temporary fix for legacy network stack
 copy rtems-6/testbusy.c /testbusy.c
 
-# setup and compile RTEMS BSP
-# Git commits are from 13 May 2022
+# Setup and compile RTEMS BSP
 run mkdir -p ${HOME}/rtems-6 \
   && cd ${HOME} \
-  && git clone git://git.rtems.org/rtems-source-builder.git \
+  && git clone -b 6 https://gitlab.rtems.org/rtems/tools/rtems-source-builder.git \
   && cd rtems-source-builder/rtems \
-  && git checkout 620b6243 \
-  && ../source-builder/sb-set-builder --prefix=$HOME/rtems-6 6/rtems-i386 \
+  && ../source-builder/sb-set-builder --prefix=$HOME/rtems-6 6/rtems-i386
 # clone RTEMS source tree
-  && cd ${HOME} \
-  && git clone git://git.rtems.org/rtems.git \
+run cd ${HOME} \
+  && git clone -b 6 https://gitlab.rtems.org/rtems/rtos/rtems.git \
   && export PATH=$HOME/rtems-6/bin:$PATH \
 # Build RTEMS BSP 
   && cd rtems \
-  && git checkout 3ccfb583 \
   && mv /config.ini . \
   && ./waf configure --prefix=${HOME}/rtems-6 \
   && ./waf \
-  && ./waf install \
+  && ./waf install
 # Get and build the legacy network stack
-  && cd ${HOME} \
-  && git clone git://git.rtems.org/rtems-net-legacy.git \
+run cd ${HOME} \
+  && git clone -b 6 https://gitlab.rtems.org/rtems/pkg/rtems-net-legacy.git \
   && cd rtems-net-legacy \
-  && git checkout 1d492241 \
   && git submodule update --init \
   && mv /testbusy.c libtest/testbusy.c \
   && ./waf configure --prefix=$HOME/rtems-6 \
-  && ./waf build install 
+  && ./waf build install
 
 # install git from source for updated version
 run apt-get install -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext cmake
@@ -67,5 +66,6 @@ run tar -zxf dosfstools.tar.gz && rm dosfstools.tar.gz
 run cd dosfstools-* && ./configure && make && make prefix=/usr/local install
 
 # Remove unecessary dependencies now that rtems is built
-run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl
+run apt-get purge -y libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip git flex bison texinfo curl \
+  libgmp-dev libmpfr-dev bzip2 xz-utils
 run apt-get autoremove -y

rtems-6/config.ini

@@ -1,4 +1,3 @@
 [i386/pc686]
-RTEMS_POSIX_API = False 
-BUILD_TESTS = False 
-
+RTEMS_POSIX_API = True
+BUILD_TESTS = False