base: update AREA_DETECTOR version to R3-14.

Remove backport, since it is now in the used version. Co-authored-by: Érico Nogueira <[email protected]>
cnpem · Dec 9, 2024 · 36053b1 · 36053b1
1 parent c35f82e
commit 36053b1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 44 deletions.
diff --git a/base/.env b/base/.env
@@ -0,0 +1,25 @@
+DEBIAN_VERSION=11.7
+ALPINE_VERSION=3.18.4
+
+EPICS7_BASE_VERSION=7.0.7
+PVXS_VERSION=1.3.1
+
+SEQUENCER_VERSION=2.2.9
+CALC_VERSION=R3-7-5
+ASYN_VERSION=R4-44-2
+STREAMDEVICE_VERSION=2.8.24
+BUSY_VERSION=R1-7-4
+AUTOSAVE_VERSION=R5-11
+SSCAN_VERSION=R2-11-6
+RECCASTER_VERSION=1.5
+IPAC_VERSION=2.16
+CAPUTLOG_VERSION=R4.0
+RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
+
+AREA_DETECTOR_VERSION=R3-13
+NDSSCPIMEGA_VERSION=1.0.0
+
+MOTOR_VERSION=R7-3-1
+PMAC_VERSION=2-6-1
+
+LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -58,7 +58,6 @@ COPY backport-ipmicomm.patch ipmicomm.patch caputlog-waveform-fix.patch $EPICS_I
 COPY modules_versions.sh install_modules.sh $EPICS_IN_DOCKER
 RUN NEEDS_TIRPC=YES $EPICS_IN_DOCKER/install_modules.sh
 
-COPY backport-adsupport-nanohttp.patch $EPICS_IN_DOCKER
 COPY area_detector_versions.sh install_area_detector.sh $EPICS_IN_DOCKER
 RUN $EPICS_IN_DOCKER/install_area_detector.sh
 

diff --git a/base/area_detector_versions.sh b/base/area_detector_versions.sh
@@ -1,3 +1,3 @@
-AREA_DETECTOR_VERSION=R3-12-1
+AREA_DETECTOR_VERSION=R3-14
 NDSSCPIMEGA_VERSION=1.0.0
 LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
diff --git a/base/backport-adsupport-nanohttp.patch b/base/backport-adsupport-nanohttp.patch
diff --git a/base/install_area_detector.sh b/base/install_area_detector.sh
@@ -97,8 +97,6 @@ ARAVIS_INCLUDE=$(pkg-config --cflags-only-I aravis-0.8 | sed -e "s|-I||g")
 
 cd -
 
-patch -d ADSupport -Np1 < ${EPICS_IN_DOCKER}/backport-adsupport-nanohttp.patch
-
 make -j${JOBS}
 make clean
-Original file line number
+Diff line change
@@ Expand Up @@
     cd -
-    patch -d ADSupport -Np1 < ${EPICS_IN_DOCKER}/backport-adsupport-nanohttp.patch
     make -j${JOBS}
     make clean
@@ Expand Down @@