diff --git a/Dockerfile b/Dockerfile index c3a6d8e..3c5c51c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,17 +20,14 @@ RUN apt-get update -y && apt-get upgrade -y && \ busybox \ curl \ build-essential \ - diffutils \ flex \ git \ python3-dev \ - python3-venv \ && rm -rf /var/lib/apt/lists/* && \ busybox --install -# setup a python venv - requried by the RSB to find 'python' -RUN python3 -m venv ${VIRTUALENV} -ENV PATH=${VIRTUALENV}/bin:${PATH} +# RSB looks for 'python' +RUN ln -s /usr/bin/python3 /usr/bin/python # get the RTEMS Source Builder WORKDIR ${RTEMS_BASE} @@ -66,9 +63,8 @@ RUN git apply VMEConfig.patch && \ RUN ./waf && \ ./waf install -RUN git clone git://git.rtems.org/rtems-net-legacy.git ${RTEMS_BASE}/rtems-net-legacy - # add in the legacy network stack +RUN git clone git://git.rtems.org/rtems-net-legacy.git ${RTEMS_BASE}/rtems-net-legacy WORKDIR ${RTEMS_BASE}/rtems-net-legacy RUN git submodule init && \ git submodule update && \ diff --git a/README.md b/README.md index 8ecfab5..ac8051b 100644 --- a/README.md +++ b/README.md @@ -12,23 +12,3 @@ The current configuration is:- This container can be run to experiment with building components with the RSP and prebuilt rtems6 toolchain. See https://docs.rtems.org/branches/master/user/start/index.html - -To just get the Board Support Package (BSP) with toolchain, you can extract these products into your own container with: - -``` -ENV RTEMS_VERSION=6.1-rc2 -ENV RTEMS_TOP=/rtems${RTEMS_VERSION}-beatnik-legacy/rtems/${RTEMS_VERSION}/ -ENV RTEMS_BSP_IMAGE=ghcr.io/epics-containers/rtems6-powerpc-linux-developer - -COPY --from=${RTEMS_BSP_IMAGE}:${RTEMS_VERSION} ${RTEMS_TOP} ${RTEMS_TOP} -``` - -Or you can get the BSP locally with: -``` -docker run --rm -v $(pwd):/workdir ghcr.io/epics-containers/rtems6-powerpc-linux-developer:6.1-rc2 -# in another terminal -mkdir -p /rtems6-beatnik-legacy/rtems/ -docker cp $(docker ps -lq):/rtems6-beatnik-legacy/rtems/6.1-rc2/ /rtems6-beatnik-legacy/rtems/6.1-rc2/ -``` - -IMPORTANT: the BSP contains absolute paths so you must copy it to the same path as inside the container.