Skip to content

Commit

Permalink
base: add support for Pmac module.
Browse files Browse the repository at this point in the history
- Added support for Pmac module.
- In the CONFIG_SITE file it was observed that the --cflags-only-I,
  command for libssh2 does not work, receiving an empty directory,
- for this reason, --variable=includedir was used to solve
  the problem.
- Compilation error in Pmac module with JOBS>1, probably due to
  not well-defined dependencies in the module's Makefile,
  it was set JOBS=1 to build  module.
  • Loading branch information
guirodrigueslima committed Nov 28, 2023
1 parent 5217fd9 commit 0242e1a
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 0 deletions.
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: add support for Pmac module. by @guirodrigueslima in
https://github.com/cnpem/epics-in-docker/pull/26

## v0.4.0

All users should update to ease deployment on container setups with limited
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ registry.
must include `libxml2` and `libtiff5` in the `RUNTIME_PACKAGES`, as they are
not built in `ADSupport`.

### Pmac IOCs

`Pmac` IOCs must include `libssh2-1` in the `RUNTIME PACKAGES`, because the module depends on it.

### Possible issues

Known build and runtime issues are documented in the [SwC
Expand Down
3 changes: 3 additions & 0 deletions base/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
DEBIAN_VERSION=11.7

EPICS7_BASE_VERSION=7.0.7

SEQUENCER_VERSION=2.2.9
CALC_VERSION=R3-7-4
ASYN_VERSION=R4-44-2
Expand All @@ -13,4 +14,6 @@ IPAC_VERSION=2.16
CAPUTLOG_VERSION=R4.0

AREA_DETECTOR_VERSION=R3-12-1

MOTOR_VERSION=R7-3-1
PMAC_VERSION=2-6-1
2 changes: 2 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN apt update -y && \
git \
libaravis-dev \
libreadline-dev \
libssh2-1-dev \
libtiff-dev \
libusb-1.0-0-dev \
libxml2-dev \
Expand Down Expand Up @@ -46,6 +47,7 @@ ARG CAPUTLOG_VERSION

ARG AREA_DETECTOR_VERSION
ARG MOTOR_VERSION
ARG PMAC_VERSION

WORKDIR ${EPICS_MODULES_PATH}
COPY install_modules.sh .
Expand Down
1 change: 1 addition & 0 deletions base/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ services:
CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
MOTOR_VERSION: ${MOTOR_VERSION}
PMAC_VERSION: ${PMAC_VERSION}
29 changes: 29 additions & 0 deletions base/install_motor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -ex

. /opt/epics/install-functions.sh

git clone --depth 1 --branch ${MOTOR_VERSION} \
https://github.com/epics-modules/motor

Expand Down Expand Up @@ -34,3 +36,30 @@ cd ..

make -j${JOBS}
make clean

cd $EPICS_MODULES_PATH

download_github_module dls-controls pmac $PMAC_VERSION

rm pmac/configure/RELEASE.local.linux-x86_64
rm pmac/configure/RELEASE.linux-x86_64.Common
rm pmac/configure/CONFIG_SITE.linux-x86_64.Common

echo "
BUILD_IOCS=NO
USE_GRAPHICSMAGICK=NO
SSH = YES
SSH_LIB = $(pkg-config --variable=libdir libssh2)
SSH_INCLUDE = $(pkg-config --cflags-only-I libssh2)
WITH_BOOST = NO
" >> pmac/configure/CONFIG_SITE

JOBS=1 install_module pmac PMAC "
EPICS_BASE=${EPICS_BASE_PATH}
ASYN=${EPICS_MODULES_PATH}/asyn
CALC=${EPICS_MODULES_PATH}/calc
MOTOR=${EPICS_MODULES_PATH}/motor
BUSY=${EPICS_MODULES_PATH}/busy
"

0 comments on commit 0242e1a

Please sign in to comment.