From d9bf140be1a48a01be720ab7479bbc2960f0b8a2 Mon Sep 17 00:00:00 2001 From: Palash Gandhi Date: Mon, 18 Nov 2024 10:01:03 -0800 Subject: [PATCH] DLPX-92722 recovery-environment fails to build on 24.04 due to erroneous path PR URL: https://www.github.com/delphix/recovery-environment/pull/44 --- debian/control | 2 +- scripts/stage1.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5b2f16e..6200bb3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: recovery-environment Section: misc Priority: optional Maintainer: Paul Dagnelie -Build-Depends: debhelper (>= 10) +Build-Depends: debhelper (>= 10), systemd-resolved Standards-Version: 4.1.2 Vcs-Git: https://github.com/delphix/recovery-environment.git #Vcs-Browser: https://github.com/delphix/recovery-environment diff --git a/scripts/stage1.sh b/scripts/stage1.sh index 747aec0..606aec3 100755 --- a/scripts/stage1.sh +++ b/scripts/stage1.sh @@ -29,7 +29,7 @@ function get_deps() { # sudo rm /etc/ld.so.cache sudo ldconfig - (LD_LIBRARY_PATH="$(ldconfig -v 2>/dev/null | grep -v ^$'\t' | sed "s@^@$workdir@" | tr -d '\n'):$workdir/lib/systemd" \ + (LD_LIBRARY_PATH="$(ldconfig -v 2>/dev/null | grep -v ^$'\t' | sed "s@^@$workdir@" | cut -d':' -f1 | paste -sd':' | tr -d '\n'):$workdir/usr/lib/x86_64-linux-gnu/systemd" \ ldd "$binary" 2>/dev/null || true) | while read -r line; do if ! echo "$line" | grep "=>" &>/dev/null; then continue