Skip to content

Commit

Permalink
add make clean
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Feb 29, 2024
1 parent 65b66a6 commit 7349358
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ COPY epics /epics
# get and build EPICS base
RUN git clone ${EPICS_BASE_SRC} -q ${GIT_OPTS} ${EPICS_BASE} && \
bash /epics/scripts/patch-epics-base.sh
RUN make -C ${EPICS_BASE} -j $(nproc)
RUN make -C ${EPICS_BASE} -j $(nproc); make -C ${EPICS_BASE} clean

# also build the sequencer as it is used by many support modules
RUN bash /epics/scripts/get-sncseq.sh
RUN make -C ${SUPPORT}/sncseq -j $(nproc)
RUN make -C ${SUPPORT}/sncseq -j $(nproc); make -C ${SUPPORT}/sncseq clean

# setup a global python venv and install ibek
COPY requirements.txt /requirements.txt
Expand Down
7 changes: 6 additions & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ cd $(dirname ${0})
# use docker if available else use podman
if ! docker version &>/dev/null; then docker=podman; else docker=docker; fi

if ! $docker buildx version &>/dev/null; then
echo "buildx required. (install with 'apt install docker-buildx')"
exit 1
fi

# make sure new repos get their submodule ibek-support
git submodule update --init

# build and developer images
$docker build --network host --target $TARGET \
$docker buildx build --network host --target $TARGET \
--build-arg TARGETARCH=amd64 \
--build-arg TARGET_ARCHITECTURE=$T_A \
-t ${TAG} .
3 changes: 0 additions & 3 deletions epics/scripts/runtime-prep-epics-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ if [[ $TARGET_ARCHITECTURE == "rtems" ]]; then
echo "removing non rtems architecture binaries"
rm -rf ${EPICS_BASE}/bin/${EPICS_HOST_ARCH}
rm -rf ${EPICS_BASE}/lib/${EPICS_HOST_ARCH}

else
echo "No epics-base patch required for architecture <$TARGET_ARCHITECTURE>"
fi

0 comments on commit 7349358

Please sign in to comment.