From b1172422d1e95a0c2885f7ec50d17504dfaff733 Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Tue, 11 Mar 2025 10:39:11 +0100
Subject: [PATCH 1/2] packages legacy: do now embed the dal parameters in the
 dal node package

---
 scripts/dpkg/make_dpkg.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/scripts/dpkg/make_dpkg.sh b/scripts/dpkg/make_dpkg.sh
index 94fb4767fd76..eb588dc694a6 100755
--- a/scripts/dpkg/make_dpkg.sh
+++ b/scripts/dpkg/make_dpkg.sh
@@ -129,15 +129,6 @@ for control_file in "$myhome"/*control.in; do
       "${staging_dir}/usr/share/zcash-params"
   fi
 
-  if [ "$pg" = "dal-node" ]; then
-    # call the install script to make available the
-    # zcash parameters on the build host
-    scripts/install_dal_trusted_setup.sh
-    zcashParams "${common}/${pg}-zcash" \
-      "${staging_dir}/usr/share/dal-trusted-setup" \
-      _opam/share/dal-trusted-setup
-  fi
-
   # Build the package
   #
   echo "=> Constructing package ${dpkg_fullname}"
-- 
GitLab


From b3651ead2c3bd88f8058d4ca0ddd2a7ca8afdf40 Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Tue, 11 Mar 2025 14:27:23 +0100
Subject: [PATCH 2/2] ci: move dal params in build image

---
 images/ci/Dockerfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/images/ci/Dockerfile b/images/ci/Dockerfile
index 8bab3e8ac9b8..08c6ea9c8971 100644
--- a/images/ci/Dockerfile
+++ b/images/ci/Dockerfile
@@ -59,8 +59,6 @@ RUN apk update \
     libc-dev \
     libev \
     libffi \
-    # Used by 'scripts/install_dal_trusted_setup.sh' below
-    curl \
     sudo \
     sqlite-libs \
     # Used by teztale
@@ -68,13 +66,6 @@ RUN apk update \
     sqlite-dev \
     postgresql-dev
 
-# Install dal SRS setup (need curl)
-COPY scripts/install_dal_trusted_setup.sh scripts/version.sh /tmp/
-RUN mkdir -p /usr/share/dal-trusted-setup && \
-    DAL_TRUSTED_SETUP=/usr/share/dal-trusted-setup \
-    sh /tmp/install_dal_trusted_setup.sh && \
-    rm /tmp/install_dal_trusted_setup.sh /tmp/version.sh
-
 USER tezos
 ENV USER=tezos
 WORKDIR /home/tezos
@@ -347,6 +338,13 @@ RUN apk update \
  && apk add --no-cache curl git file make jq websocat gcc clang lld \
  && apk add --no-cache ca-certificates build-base musl-dev libusb-dev linux-headers procps-ng
 
+# Install dal SRS setup (need curl)
+COPY scripts/install_dal_trusted_setup.sh scripts/version.sh /tmp/
+RUN mkdir -p /usr/share/dal-trusted-setup && \
+    DAL_TRUSTED_SETUP=/usr/share/dal-trusted-setup \
+    sh /tmp/install_dal_trusted_setup.sh && \
+    rm /tmp/install_dal_trusted_setup.sh /tmp/version.sh
+
 ## Add npm from 3.21 main repository instead of 3.20 to get a newer version (v22) of nodejs.
 ## Should solve related hanging problems  cf.
 ## - https://github.com/npm/cli/issues/4028
-- 
GitLab