diff --git a/CHANGES.md b/CHANGES.md index 0f98a69..cce9bd5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,11 @@ ## Unreleased +### New features + +* base: update backport- ipmicomm.patch to install general templates. by +@gustavosr8 in https://github.com/cnpem/epics-in-docker/pull/73. + ## v0.9.0 Users willing to use `iocStats`, `ipmiComm`, `pyDevSup`, `SNMP`, `motorPIGCS2`, diff --git a/base/Dockerfile b/base/Dockerfile index 96e08e8..be18cd6 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -65,7 +65,7 @@ ARG SNMP_VERSION ARG SCALER_VERSION ARG MCA_VERSION -COPY ipmicomm.patch . +COPY backport-ipmicomm.patch . COPY caputlog-waveform-fix.patch . COPY install_modules.sh . RUN ./install_modules.sh diff --git a/base/ipmicomm.patch b/base/backport-ipmicomm.patch similarity index 91% rename from base/ipmicomm.patch rename to base/backport-ipmicomm.patch index 26cf349..9a142b0 100644 --- a/base/ipmicomm.patch +++ b/base/backport-ipmicomm.patch @@ -1,5 +1,24 @@ From: https://github.com/slac-epics-modules/ipmiComm/pull/26/ From: https://github.com/slac-epics-modules/ipmiComm/pull/28/ +From: https://github.com/slac-epics-modules/ipmiComm/pull/29/ +diff --git a/Db/Makefile b/Db/Makefile +index 207577c..3ac6be8 100644 +--- a/Db/Makefile ++++ b/Db/Makefile +@@ -22,6 +22,13 @@ include $(TOP)/configure/CONFIG + # Optimization of db files using dbst (DEFAULT: NO) + #DB_OPT = YES. + ++# General modules ++DB += fru_common.db ++DB += fru_cu_common.db ++DB += sensor_ai.db ++DB += system_chassis_status.db ++DB += system_common.db ++ + # Files that make up our high-level templates + DB += fru_basic.db + DB += fru_extended.db diff --git a/iocs/ipmicomm-test-IOC/configure/RELEASE b/iocs/ipmicomm-test-IOC/configure/RELEASE index 2822ab1..0ab1707 100644 --- a/iocs/ipmicomm-test-IOC/configure/RELEASE diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index e47ecea..826bf81 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -66,7 +66,7 @@ ARG SCALER_VERSION ARG MCA_VERSION WORKDIR ${EPICS_MODULES_PATH} -COPY ipmicomm.patch . +COPY backport-ipmicomm.patch . COPY caputlog-waveform-fix.patch . COPY install_modules.sh . RUN NEEDS_TIRPC=YES ./install_modules.sh