Skip to content

Commit

Permalink
base: update epics-base to 7.0.8.1.
Browse files Browse the repository at this point in the history
This also made it necessary to update the OPCUA module, so we could keep
using the prebuilt version.
  • Loading branch information
ericonr committed Oct 31, 2024
1 parent be9c1ab commit 224dff3
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 48 deletions.
4 changes: 2 additions & 2 deletions base/.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DEBIAN_VERSION=11.9
ALPINE_VERSION=3.20.3

EPICS7_BASE_VERSION=7.0.7
EPICS7_BASE_VERSION=7.0.8.1
PVXS_VERSION=1.3.1

SEQUENCER_VERSION=R2-2-9
Expand Down Expand Up @@ -32,4 +32,4 @@ MOTOR_VERSION=R7-3-1
PIGCS2_VERSION=60af8bdb17c1717e4545d8170f820e358ce31458
PMAC_VERSION=2-6-4b3

OPCUA_VERSION=0.9.4
OPCUA_VERSION=0.10.0
1 change: 0 additions & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ ENV EPICS_BASE_PATH /opt/epics/base
ENV EPICS_MODULES_PATH /opt/epics/modules
ENV EPICS_RELEASE_FILE /opt/epics/RELEASE

COPY backport-epics-base-musl.patch .
COPY epics-base-static-linking.patch .
COPY install_epics.sh .
RUN ./install_epics.sh
Expand Down
42 changes: 0 additions & 42 deletions base/backport-epics-base-musl.patch

This file was deleted.

1 change: 0 additions & 1 deletion base/install_epics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ set -ex
lnls-get-n-unpack -l https://epics-controls.org/download/base/base-${EPICS_BASE_VERSION}.tar.gz
mv base-${EPICS_BASE_VERSION} ${EPICS_BASE_PATH}

patch -d ${EPICS_BASE_PATH} -Np1 < backport-epics-base-musl.patch
patch -d ${EPICS_BASE_PATH} -Np1 < epics-base-static-linking.patch

if [ -n "$COMMANDLINE_LIBRARY" ]; then
Expand Down
2 changes: 1 addition & 1 deletion base/install_opcua.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ex
. /opt/epics/install-functions.sh

opcua_release_url=https://github.com/epics-modules/opcua/releases/download/v${OPCUA_VERSION}
opcua_release_file=IOC_opcua-${OPCUA_VERSION}_Base-${EPICS_BASE_VERSION}_debian${DEBIAN_VERSION%.*}.tar.gz
opcua_release_file=BDIST_opcua-${OPCUA_VERSION}_Base-${EPICS_BASE_VERSION}_debian${DEBIAN_VERSION%.*}.tar.gz
lnls-get-n-unpack -l $opcua_release_url/$opcua_release_file

mv binaryOpcuaIoc opcua
Expand Down
1 change: 0 additions & 1 deletion base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ ENV EPICS_RELEASE_FILE /opt/epics/RELEASE
WORKDIR /opt/epics
COPY install-functions.sh .

COPY backport-epics-base-musl.patch .
COPY epics-base-static-linking.patch .
COPY install_epics.sh .
RUN COMMANDLINE_LIBRARY=READLINE_NCURSES ./install_epics.sh
Expand Down

0 comments on commit 224dff3

Please sign in to comment.