Merge pull request #43 from epics-containers/RTEMS6

update to latest rtems-bsp 6.1ec4

.github/workflows/build.yml

@@ -29,7 +29,8 @@ jobs:
           - epics-target: RTEMS-beatnik
             epics-host: linux-x86_64
             name: epics-base-rtems-beatnik
-            base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec3
+            # NOTE: when changing this - also change it in '/build'
+            base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec4
             platform: linux/amd64
 
           # cross compile to arm64

Dockerfile

@@ -61,9 +61,8 @@ RUN make -C ${EPICS_BASE} -j $(nproc); make -C ${EPICS_BASE} clean
 RUN bash ${EPICS_ROOT}/scripts/make_pvxs.sh
 ENV PATH=${EPICS_ROOT}/pvxs/bin/${EPICS_HOST_ARCH}:${PATH}
 
-# create a virtual environment to be used by IOCs to install ibek
-# except when based on the RTEMS BSP image which supplies /venv
-RUN ! test -d /venv && python3 -m venv /venv
+# create a venv for IOCs to install ibek
+RUN python3 -m venv /venv
 
 ##### runtime preparation stage ################################################
 FROM developer AS runtime_prep

build

@@ -14,7 +14,7 @@ TARGET=${TARGET:-developer}
 TAG=${TAG:-ec_test}
 
 if [ "$T_A" = "RTEMS-beatnik" ]; then
-    base="ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec1"
+    base="ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec4"
 else
     base="ubuntu:24.04"
 fi