From cb80f2be965a1d80a8074dcb6831bd9598f806ba Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Sun, 28 Sep 2025 11:48:06 +0300
Subject: [PATCH] Deb PPA: some more eatmydata musings that i missed in earlier
 change

---
 .github/workflows/deb-buildd.yml |  7 +++++++
 .github/workflows/deb-src.yml    | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deb-buildd.yml b/.github/workflows/deb-buildd.yml
index 0789c7fa..db171a1c 100644
--- a/.github/workflows/deb-buildd.yml
+++ b/.github/workflows/deb-buildd.yml
@@ -156,6 +156,13 @@ jobs:
           if [ "${{ inputs.dist-name }}" = "debian" ];
           then
           tee -a ~/.sbuildrc > /dev/null <<EOT
+          \$external_commands = {
+            'chroot-setup-commands' => [ "export LD_PRELOAD=/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE)/libeatmydata.so" ]
+          };
+          \$build_environment = {
+            "LD_PRELOAD" => "/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE)/libeatmydata.so"
+          };
+          \$environment_filter = [Dpkg::BuildInfo::get_build_env_allowed(), '^LD_PRELOAD$'];
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
             '--hook-dir=/usr/share/mmdebstrap/hooks/eatmydata'
           ];
diff --git a/.github/workflows/deb-src.yml b/.github/workflows/deb-src.yml
index 4d76f33e..0f1275b4 100644
--- a/.github/workflows/deb-src.yml
+++ b/.github/workflows/deb-src.yml
@@ -130,6 +130,13 @@ jobs:
           \$unshare_tmpdir_template = '/tmp/tmp.sbuild.XXXXXXXXXX';
           EOT
           tee -a ~/.sbuildrc > /dev/null <<EOT
+          \$external_commands = {
+            'chroot-setup-commands' => [ "export LD_PRELOAD=/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE)/libeatmydata.so" ]
+          };
+          \$build_environment = {
+            "LD_PRELOAD" => "/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE)/libeatmydata.so"
+          };
+          \$environment_filter = [Dpkg::BuildInfo::get_build_env_allowed(), '^LD_PRELOAD$'];
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
             '--include=eatmydata',
             '--hook-dir=/usr/share/mmdebstrap/hooks/eatmydata',
@@ -143,7 +150,8 @@ jobs:
         timeout-minutes: 1
         run: |
           set -xe
-          eatmydata curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain $RUST_VERSION --profile minimal -y
+          eatmydata curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+            eatmydata sh -s -- --default-toolchain $RUST_VERSION --profile minimal -y
           . "$HOME/.cargo/env"
       - name: Fetch our git repository
         timeout-minutes: 1