diff --git a/base/.env b/base/.env new file mode 100644 index 0000000..6993e75 --- /dev/null +++ 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 index 1c39ab4..83dbd4a 100644 --- 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 index 42c78f4..acba440 100644 --- 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 deleted file mode 100644 index ac162e0..0000000 --- a/base/backport-adsupport-nanohttp.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9326adbf88b7e4501b4ba1b53d267c2c3f921c78 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Thu, 3 Aug 2023 08:16:00 -0300 -Subject: [PATCH] Fix nanohttp_stream build with external libxml2. - -Commit 2e167d2bd5a002b079589abb32b4e454e234355e defined IN_LIBXML -unconditionally inside nanohttp_stream.c, which, when building on Linux -with external libxml2, leads to multiple linking errors, since the -redirections from "elfgcchack.h" are still included. The symbols will -only be available when building the library inside ADSupport, so we can -only define IN_LIBXML in that case. ---- - supportApp/xml2Src/Makefile | 1 + - supportApp/xml2Src/nanohttp_stream.c | 1 - - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/supportApp/xml2Src/Makefile b/supportApp/xml2Src/Makefile -index 1ba2696..b855c48 100644 ---- a/supportApp/xml2Src/Makefile -+++ b/supportApp/xml2Src/Makefile -@@ -123,6 +123,7 @@ ifeq ($(XML2_EXTERNAL),NO) - LIB_SRCS += xmlstring.c - - nanohttp_stream_LIBS += xml2 -+ nanohttp_stream_CFLAGS += -DIN_LIBXML - - else - nanohttp_stream_SYS_LIBS += xml2 -diff --git a/supportApp/xml2Src/nanohttp_stream.c b/supportApp/xml2Src/nanohttp_stream.c -index 9d234c1..0433a9e 100644 ---- a/supportApp/xml2Src/nanohttp_stream.c -+++ b/supportApp/xml2Src/nanohttp_stream.c -@@ -12,7 +12,6 @@ - */ - - #define NEED_SOCKETS --#define IN_LIBXML - #include "libxml.h" - - #ifdef LIBXML_HTTP_ENABLED diff --git a/base/install_area_detector.sh b/base/install_area_detector.sh index ae82d9d..39c68b4 100755 --- 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