prjemian / epics-docker

Provide EPICS IOCs in docker images
9 stars 4 forks source link

update EPICS base to latest (7.0.5) #36

Closed prjemian closed 3 years ago

prjemian commented 3 years ago
(base) prjemian@zap:~/.../epics-docker/v1.1$ git grep 7.0.4 | grep -v build-log | grep -v makelog
n2_epics_base/Dockerfile:ENV EPICS_BASE_NAME=base-7.0.4.1
n2_epics_base/Dockerfile:ENV EPICS_BASE_DIR_NAME=base-R7.0.4.1
n2_epics_base/Makefile:REPO=epics-base-7.0.4.1
n2_epics_base/README.md:The [`prjemian/epics-base-7.0.4.1`
n2_epics_base/README.md:image](https://hub.docker.com/r/prjemian/epics-base-7.0.4.1/tags)
n2_epics_base/README.md:7.0.4.1](https://epics.anl.gov/base/R7-0/4.php), the Experimental
n2_epics_base/README.md:`/opt/base-R7.0.4.1` which is soft-linked to `/opt/base`.
n2_epics_base/README.md:        --name=epics-base-7.0.4.1 \
n2_epics_base/README.md:        prjemian/epics-base-7.0.4.1
n2_epics_base/README.md:    >         --name=epics-base-7.0.4.1 \
n2_epics_base/README.md:    >         prjemian/epics-base-7.0.4.1
n2_epics_base/README.md:        run prjemian/epics-base-7.0.4.1 \
n2_epics_base/README.md:    dbLoadDatabase("/opt/base-R7.0.4.1/bin/linux-x86_64/../../dbd/softIoc.dbd")
n2_epics_base/README.md:    ## EPICS R7.0.4.1
n2_epics_base/README.md:        run prjemian/epics-base-7.0.4.1 \
n2_epics_base/README.md:    ENV EPICS_BASE_NAME=base-7.0.4.1
n2_epics_base/README.md:    ENV EPICS_BASE_DIR_NAME=base-R7.0.4.1
n2_epics_base/README.md:    docker run -ti -d --rm prjemian/epics-base-7.0.4.1:latest \
n2_epics_base/README.md:    docker run -ti -d --rm prjemian/epics-base-7.0.4.1:latest \
n2_epics_base/README.md:`prjemian/os_only-1.1` | `prjemian/epics-base-7.0.4.1` |  this image
n3_synApps/Dockerfile:FROM  prjemian/epics-base-7.0.4.1
n3_synApps/README.md:`prjemian/epics-base-7.0.4.1` |  `prjemian/synapps-6.2` | this image
n3_synApps/README.md:`prjemian/os_only-1.1` | `prjemian/epics-base-7.0.4.1` |  EPICS base release 7.0.4.1
n4_areaDetector/README.md:`prjemian/epics-base-7.0.4.1` |  `prjemian/synapps-6.2` | synApps release 6.2
n4_areaDetector/README.md:`prjemian/os_only-1.1` | `prjemian/epics-base-7.0.4.1` |  EPICS base release 7.0.4.1
n4_areaDetector/ioc_files/recommended_AD_edits.sh:sed -i s:'EPICS_BASE=/corvette/usr/local/epics-devel/base-7.0.4':'EPICS_BASE=/opt/base-R7.0.4.1':g RELEASE_LIBS.local
n4_areaDetector/ioc_files/recommended_AD_edits.sh:sed -i s:'EPICS_BASE=/corvette/usr/local/epics-devel/base-7.0.4':'EPICS_BASE=/opt/base-R7.0.4.1':g RELEASE_PRODS.local
n5_custom_synApps/README.md:`prjemian/epics-base-7.0.4.1` |  `prjemian/synapps-6.2` | synApps release 6.2
n5_custom_synApps/README.md:`prjemian/os_only-1.1` | `prjemian/epics-base-7.0.4.1` |  EPICS base release 7.0.4.1
n6_custom_areaDetector/README.md:`prjemian/epics-base-7.0.4.1` |  `prjemian/synapps-6.2` | synApps release 6.2
n6_custom_areaDetector/README.md:`prjemian/os_only-1.1` | `prjemian/epics-base-7.0.4.1` |  EPICS base release 7.0.4.1
prjemian commented 3 years ago

Note: caputRecorder must be built from master branch due to

/usr/bin/gcc  -D_GNU_SOURCE -D_DEFAULT_SOURCE           -D_X86_64_  -DUNIX  -Dlinux      -O3 -g   -Wall -Werror-implicit-function-declaration     -DUSE_TYPED_RSET -DUSE_TYPED_DSET -DUSE_TYPED_DRVET  -mtune=generic      -m64 -fPIC -I. -I../O.Common -I. -I. -I.. -I../../include/compiler/gcc -I../../include/os/Linux -I../../include -I/opt/base/include/compiler/gcc -I/opt/base/include/os/Linux -I/opt/base/include        -c ../drvVipc610.c
../subMLIS.c:20:16: error: redefinition of 'struct evSubscrip'
   20 | typedef struct evSubscrip {
      |                ^~~~~~~~~~
In file included from /opt/base/include/dbLink.h:24,
                 from /opt/base/include/dbAccess.h:25,
                 from ../subMLIS.c:8:
/opt/base/include/dbChannel.h:36:16: note: originally defined here
   36 | typedef struct evSubscrip {
      |                ^~~~~~~~~~
make[4]: *** [/opt/base/configure/RULES_BUILD:255: subMLIS.o] Error 1
make[4]: Leaving directory '/opt/synApps/support/caputRecorder-R1-7-3/caputRecorderApp/src/O.linux-x86_64'