base: update ipmicomm.patch to install general templates.

cnpem · Aug 27, 2024 · 6b79f5d · 6b79f5d
1 parent b1aeb28
commit 6b79f5d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git 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
@@ -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 → base/backport-ipmicomm.patch b/base/ipmicomm.patch → 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/install_modules.sh b/base/install_modules.sh
@@ -70,7 +70,7 @@ EPICS_BASE
 "
 
 download_from_github slac-epics-modules ipmiComm $IPMICOMM_VERSION
-patch -d ipmiComm -Np1 < ipmicomm.patch
+patch -d ipmiComm -Np1 < backport-ipmicomm.patch
 JOBS=1 install_module ipmiComm IPMICOMM "
 EPICS_BASE
 ASYN

diff --git 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