diff --git a/CHANGES.md b/CHANGES.md index b75f991..654ed03 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,8 @@ the experience of using the images. https://github.com/cnpem/epics-in-docker/69 * This allows to use APT in containers deployed in systems without subuid and subgid. +* base: patch ipmiComm to handle `CODE_DESTINATION_UNAVAIL`. by + @gustavosr8 in https://github.com/cnpem/epics-in-docker/pull/76. ### New features diff --git a/base/Dockerfile b/base/Dockerfile index a63d6b1..102df60 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -70,6 +70,7 @@ ARG SCALER_VERSION ARG MCA_VERSION COPY backport-ipmicomm.patch . +COPY ipmicomm.patch . COPY caputlog-waveform-fix.patch . COPY install_modules.sh . RUN ./install_modules.sh diff --git a/base/install_modules.sh b/base/install_modules.sh index 999d168..2dec3fc 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -71,6 +71,7 @@ EPICS_BASE download_from_github slac-epics-modules ipmiComm $IPMICOMM_VERSION patch -d ipmiComm -Np1 < backport-ipmicomm.patch +patch -d ipmiComm -Np1 < ipmicomm.patch JOBS=1 install_module ipmiComm IPMICOMM " EPICS_BASE ASYN diff --git a/base/ipmicomm.patch b/base/ipmicomm.patch new file mode 100644 index 0000000..2293f15 --- /dev/null +++ b/base/ipmicomm.patch @@ -0,0 +1,14 @@ +From: https://github.com/slac-epics-modules/ipmiComm/pull/33/ +diff --git a/src/drvMch.c b/src/drvMch.c +index 33e9b00..8a057d0 100644 +--- a/src/drvMch.c ++++ b/src/drvMch.c +@@ -1340,7 +1340,7 @@ size_t tmp = sens->readMsgLength; /* Initially set to requested msg length, + + /* If error code ... */ + if ( rval ) { +- if ( rval == IPMI_COMP_CODE_REQUESTED_DATA ) ++ if ( rval == IPMI_COMP_CODE_REQUESTED_DATA || rval == IPMI_COMP_CODE_DESTINATION_UNAVAIL ) + sens->unavail = 1; + return -1; + } diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 826bf81..3acc088 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -67,6 +67,7 @@ ARG MCA_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY backport-ipmicomm.patch . +COPY ipmicomm.patch . COPY caputlog-waveform-fix.patch . COPY install_modules.sh . RUN NEEDS_TIRPC=YES ./install_modules.sh