switch to ubuntu 24.04

Author: gilesknap

Dockerfile.beatnik

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as environment
+FROM ubuntu:24.04 as environment
 
 ENV VIRTUALENV /venv
 ENV RTEMS_MAJOR=6
@@ -28,27 +28,30 @@ RUN apt-get update -y && apt-get upgrade -y && \
     && rm -rf /var/lib/apt/lists/* && \
     busybox --install
 
+# use uv to make a python3.11 venv because the RSB does not yet support python3.12
+# see https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/issues/87
+RUN curl -LsSf https://github.com/astral-sh/uv/releases/download/0.6.0/uv-x86_64-unknown-linux-gnu.tar.gz -o uv.gz && \
+    echo cd1ac8840037940fa69fd18c51dd60ae uv.gz | md5sum -c && \
+    tar -xzf uv.gz -C /usr/bin --strip-components=1 && \
+    rm uv.gz
+
 # setup a python venv - requried by the RSB to find 'python'
-RUN python3 -mvenv ${VIRTUALENV}
+RUN uv venv --python 3.11 ${VIRTUALENV}
 ENV PATH=${VIRTUALENV}/bin:${PATH}
 
-# get the RTEMS Source Builder
+# get and patch the RTEMS Source Builder
 WORKDIR ${RTEMS_TOP}
+COPY local_patch /local_patch
 RUN curl https://ftp.rtems.org/pub/rtems/releases/${RTEMS_MAJOR}/${RTEMS_VERSION}/sources/rtems-source-builder-${RTEMS_VERSION}.tar.xz \
     | tar -xJ && \
-    mv rtems-source-builder-${RTEMS_VERSION} rsb
-
-# add in a gcc patch to only build for m7400
-COPY local_patch local_patch
-RUN local_patch/patch-rsb.sh
+    mv rtems-source-builder-${RTEMS_VERSION} rsb && \
+    git apply /local_patch/rsb.patch
 
-# get the kernel
+# get and patch the kernel
 RUN curl https://ftp.rtems.org/pub/rtems/releases/${RTEMS_MAJOR}/${RTEMS_VERSION}/sources/rtems-${RTEMS_VERSION}.tar.xz \
     | tar -xJ && \
-    mv rtems-${RTEMS_VERSION} kernel
-
-# patch the kernel
-RUN git apply local_patch/VMEConfig.patch && \
+    mv rtems-${RTEMS_VERSION} kernel && \
+    git apply /local_patch/kernel.patch && \
     cd kernel && \
     ./waf bspdefaults --rtems-bsps=${RTEMS_ARCH}/${RTEMS_BSP} > config.ini && \
     sed -i -e "s|RTEMS_POSIX_API = False|RTEMS_POSIX_API = True|" config.ini
@@ -80,9 +83,8 @@ from environment AS runtime_prep
 # To make this container target smaller we take just the BSP
 COPY --from=developer ${RTEMS_PREFIX} ${RTEMS_PREFIX}
 
-# remove files that are not required
+# remove files that are not required and using space
 RUN rm -r \
-    ${RTEMS_PREFIX}/share/doc \
     ${RTEMS_PREFIX}/share/man \
     ${RTEMS_PREFIX}/share/info \
     ${RTEMS_PREFIX}/powerpc-rtems6/lib/ldscripts

local_patch/VMEConfig.patch renamed to local_patch/kernel.patch

@@ -9,7 +9,7 @@ index 7df626a..2e6884b 100644
 -CFLAGS_OPTIMIZE_V = -O2 -g
 +CFLAGS_OPTIMIZE_V = -O2 -g -mstrict-align
  CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
- 
+
  LDFLAGS = -Wl,--gc-sections
 diff --git a/kernel/bsps/powerpc/beatnik/include/bsp/VMEConfig.h b/kernel/bsps/powerpc/beatnik/include/bsp/VMEConfig.h
 index 986a016..535abc1 100644
@@ -22,6 +22,6 @@ index 986a016..535abc1 100644
 -#define _VME_A32_WIN0_ON_VME  0x20000000
 +//#define _VME_A32_WIN0_ON_VME  0x20000000
 +#define _VME_A32_WIN0_ON_VME  0x00800000
- 
+
  /* if _VME_DRAM_OFFSET is defined, the BSP
   * will map our RAM onto the VME bus, starting

local_patch/patch-rsb.sh

@@ -0,0 +1,29 @@
+diff --git a/rsb/rtems/config/tools/rtems-default-tools.bset b/rsb/rtems/config/tools/rtems-default-tools.bset
+index 68d4bc2..87f5124 100644
+--- a/rsb/rtems/config/tools/rtems-default-tools.bset
++++ b/rsb/rtems/config/tools/rtems-default-tools.bset
+@@ -33,7 +33,8 @@ devel/gmp-internal
+ devel/mpfr-internal
+ %{with_rtems_gsed}
+ %{with_rtems_texinfo}
+-%{with_rtems_gdb}
++# don't build gdb as it is fussy about python and not usable on our boards
++#%{with_rtems_gdb}
+ %{with_rtems_binutils}
+ %{with_rtems_gcc}
+ %{with_rtems_tools}
+diff --git a/rsb/rtems/config/tools/rtems-gcc-13.3-newlib-head.cfg b/rsb/rtems/config/tools/rtems-gcc-13.3-newlib-head.cfg
+index 3fc4145..3508016 100644
+--- a/rsb/rtems/config/tools/rtems-gcc-13.3-newlib-head.cfg
++++ b/rsb/rtems/config/tools/rtems-gcc-13.3-newlib-head.cfg
+@@ -24,6 +24,10 @@
+
+ %define gcc_pre_install %include tools/rtems-install-stdcxx.cfg
+
++# patch gcc to build only for m4700 powerpc variant
++%patch add gcc file:///local_patch/gcc.patch
++%hash sha256 gcc.patch 9c2b548cf4c2b4dd202993b221afef14bd1ce9b799b2209755507190648fdffe
++
+ %define with_threads 1
+ %define with_plugin 0
+ %define with_iconv 1