From 5757be5fe2d53f5952034bf683b69b41da6b47ed Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 3 Jan 2023 16:14:00 +0800 Subject: [PATCH 1/2] [ci] Fix dpkg lock issue when building image --- src/sonic-build-hooks/hooks/dpkg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/sonic-build-hooks/hooks/dpkg b/src/sonic-build-hooks/hooks/dpkg index 7fbc90f9fe5c..294cb19f4c1f 100644 --- a/src/sonic-build-hooks/hooks/dpkg +++ b/src/sonic-build-hooks/hooks/dpkg @@ -3,8 +3,16 @@ . /usr/local/share/buildinfo/scripts/buildinfo_base.sh REAL_COMMAND=$(get_command dpkg) COMMAND_INFO="Locked by command: $REAL_COMMAND $@" -lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" ) +NEED_RELEASE_LOCK=n +if [[ "$DPKG_HOOK_LOCKED" != "y" ]];then + lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" ) + export DPKG_HOOK_LOCKED=y + NEED_RELEASE_LOCK=y +fi $REAL_COMMAND "$@" command_result=$? +if [[ "$NEED_RELEASE_LOCK" == "y" ]];then + unset DPKG_HOOK_LOCKED +fi [ "$lock_result" == y ] && release_apt_installation_lock exit $command_result From 1575fba4c3974f05cc7b6d7d268f1a3841f43059 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 3 Jan 2023 08:24:12 +0000 Subject: [PATCH 2/2] fix --- src/sonic-build-hooks/hooks/dpkg | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/sonic-build-hooks/hooks/dpkg diff --git a/src/sonic-build-hooks/hooks/dpkg b/src/sonic-build-hooks/hooks/dpkg old mode 100644 new mode 100755