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

base: update ipmicomm.patch to install general templates. #73

Merged
merged 1 commit into from
Aug 27, 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 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`,
Expand Down
2 changes: 1 addition & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions base/ipmicomm.patch → base/backport-ipmicomm.patch
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion base/install_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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