From ddba1ecb0f31a5306a36b323d1c9bb7e8dedebb0 Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Thu, 18 Apr 2024 11:23:02 +0100 Subject: [PATCH 1/2] fix(block/list): update deps to get safeMountIter fix Dep update fixes deadlock on the new safe mount which basically looped forever trying to read mounts. This would cause list_block_devices gRPC call to hang. Signed-off-by: Tiago Castro --- utils/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/dependencies b/utils/dependencies index daadec90b..81c6a5153 160000 --- a/utils/dependencies +++ b/utils/dependencies @@ -1 +1 @@ -Subproject commit daadec90b1d548190a90ddbddfdf68bc5f38f467 +Subproject commit 81c6a5153c925b309171e6300acd07987f0ec0b5 From a06f37c39a6ca1fe87d7e8c0efbb2a6aa4c90535 Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Thu, 18 Apr 2024 11:39:48 +0100 Subject: [PATCH 2/2] build: support relative cargo-vendor-dir path with non-existing Supports using CARGO_VENDOR_DIR=/tmp/bob/.. in case bob doesn't exist. Probably won't ever happen but just in case :) Signed-off-by: Tiago Castro --- scripts/release.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 47a5c087d..ac9772c82 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -37,20 +37,18 @@ pre_fetch_cargo_deps() { local outLink="--no-out-link" local cargoVendorMsg="" - local cargoVendorDir="" if [ -n "$CARGO_VENDOR_DIR" ]; then - if [ "$(realpath -s "$CARGO_VENDOR_DIR")" = "$(realpath -s "$SCRIPTDIR/..")" ]; then + if [ "$(realpath -ms "$CARGO_VENDOR_DIR")" = "$(realpath -ms "$SCRIPTDIR/..")" ]; then cargoVendorDir="$CARGO_VENDOR_DIR/$GIT_BRANCH" else cargoVendorDir="$CARGO_VENDOR_DIR/$project/$GIT_BRANCH" fi - + cargoVendorMsg="into $(realpath -ms "$cargoVendorDir") " outLink="--out-link "$cargoVendorDir"" fi for (( attempt=1; attempt<=maxAttempt; attempt++ )); do if $NIX_BUILD $outLink -A "$nixAttrPath"; then - [ -n "$cargoVendorDir" ] && cargoVendorMsg="into $(realpath -s "$cargoVendorDir") " echo "Cargo vendored dependencies pre-fetched "$cargoVendorMsg"after $attempt attempt(s)" return 0 fi