Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPICS 7.0.8.1 and opcua #85

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

### New features

* base: update to EPICS 7.0.8.1 and OPCUA 0.10.0. by @ericonr in
https://github.com/cnpem/epics-in-docker/pull/85

## v0.12.0

### New features
Expand Down
2 changes: 1 addition & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE

WORKDIR /opt/epics

COPY backport-epics-base-musl.patch epics-base-static-linking.patch $EPICS_IN_DOCKER
COPY epics-base-static-linking.patch $EPICS_IN_DOCKER
COPY epics_versions.sh install_epics.sh $EPICS_IN_DOCKER
RUN $EPICS_IN_DOCKER/install_epics.sh

Expand Down
42 changes: 0 additions & 42 deletions base/backport-epics-base-musl.patch

This file was deleted.

2 changes: 1 addition & 1 deletion base/epics_versions.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
EPICS_BASE_VERSION=7.0.7
EPICS_BASE_VERSION=7.0.8.1
1 change: 0 additions & 1 deletion base/install_epics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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 < $EPICS_IN_DOCKER/backport-epics-base-musl.patch
patch -d ${EPICS_BASE_PATH} -Np1 < $EPICS_IN_DOCKER/epics-base-static-linking.patch

if [ -n "$COMMANDLINE_LIBRARY" ]; then
Expand Down
14 changes: 9 additions & 5 deletions base/install_opcua.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ set -ex
. $EPICS_IN_DOCKER/opcua_versions.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
henriquesimoes marked this conversation as resolved.
Show resolved Hide resolved
rm HOW_TO.md

mv binaryOpcuaIoc opcua
install_module -i opcua OPCUA "
mv opcuaBinaryDist opcua-module
install_module opcua-module OPCUA "
EPICS_BASE
"

EPICS_HOST_ARCH=`perl ${EPICS_BASE_PATH}/lib/perl/EpicsHostArch.pl`
ln -s ${EPICS_MODULES_PATH}/opcua/{opcuaIocApp/libopcua.so.0.9,lib/${EPICS_HOST_ARCH}/libopcua.so}
mv opcuaExampleIoc opcua
install_module -i opcua OPCUA_IOC "
EPICS_BASE
OPCUA
"
ericonr marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE

WORKDIR /opt/epics

COPY backport-epics-base-musl.patch epics-base-static-linking.patch $EPICS_IN_DOCKER
COPY epics-base-static-linking.patch $EPICS_IN_DOCKER
COPY epics_versions.sh install_epics.sh $EPICS_IN_DOCKER
RUN COMMANDLINE_LIBRARY=READLINE_NCURSES $EPICS_IN_DOCKER/install_epics.sh

Expand Down
2 changes: 1 addition & 1 deletion base/opcua_versions.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OPCUA_VERSION=0.9.4
OPCUA_VERSION=0.10.0
Loading