From 27ed107e176e0daf9885054a31ad801e5b85cf36 Mon Sep 17 00:00:00 2001 From: xumia Date: Tue, 12 Jan 2021 09:25:12 +0000 Subject: [PATCH 1/3] Fix py3 version changed even version control enabled issue --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 2 +- src/sonic-build-hooks/scripts/symlink_build_hooks | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index 177aea7b08ac..8ac78d9f514c 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -24,7 +24,7 @@ log_err() get_command() { - local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##") + local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##" | sed "s#/usr/local/sbin:##") local command=$(PATH=$path which $1) echo $command } diff --git a/src/sonic-build-hooks/scripts/symlink_build_hooks b/src/sonic-build-hooks/scripts/symlink_build_hooks index 7218575ee9ab..3d568171cc8e 100755 --- a/src/sonic-build-hooks/scripts/symlink_build_hooks +++ b/src/sonic-build-hooks/scripts/symlink_build_hooks @@ -2,6 +2,7 @@ HOOK_PATH=/usr/local/share/buildinfo/hooks TARGET_PATH=/usr/sbin +[ -d /usr/local/sbin ] && TARGET_PATH=/usr/local/sbin FILES=$(ls $HOOK_PATH) usage() From abe275cd3fe3a3f036266520c4ee94173efefe7a Mon Sep 17 00:00:00 2001 From: xumia Date: Wed, 13 Jan 2021 01:42:19 +0000 Subject: [PATCH 2/3] Add some comments and simplify the script --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 6 +++++- src/sonic-build-hooks/scripts/symlink_build_hooks | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index 8ac78d9f514c..a5fd2c4709c6 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -22,15 +22,19 @@ log_err() echo "$1" 1>&2 } +# Get the real command not hooked by sonic-build-hook package get_command() { - local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/sbin:##" | sed "s#/usr/local/sbin:##") + local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/local/sbin:##") local command=$(PATH=$path which $1) echo $command } check_version_control() { + # The env variable SONIC_VERSION_CONTROL_COMPONENTS examples: + # all -- match all components + # py2,py3,deb -- match py2, py3 and deb only if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,$1,* ]]; then echo "y" else diff --git a/src/sonic-build-hooks/scripts/symlink_build_hooks b/src/sonic-build-hooks/scripts/symlink_build_hooks index 3d568171cc8e..2ce5ec27720f 100755 --- a/src/sonic-build-hooks/scripts/symlink_build_hooks +++ b/src/sonic-build-hooks/scripts/symlink_build_hooks @@ -1,8 +1,7 @@ #!/bin/bash HOOK_PATH=/usr/local/share/buildinfo/hooks -TARGET_PATH=/usr/sbin -[ -d /usr/local/sbin ] && TARGET_PATH=/usr/local/sbin +TARGET_PATH=/usr/local/sbin FILES=$(ls $HOOK_PATH) usage() From a1ed7d52697e03f28f20bccc7c52fa52f1d9a0eb Mon Sep 17 00:00:00 2001 From: xumia Date: Wed, 13 Jan 2021 03:11:46 +0000 Subject: [PATCH 3/3] Add the comment to explain how to get the not hooked command --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index a5fd2c4709c6..ae85c2dcf129 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -25,6 +25,7 @@ log_err() # Get the real command not hooked by sonic-build-hook package get_command() { + # Change the PATH env to get the real command by excluding the command in the hooked folders local path=$(echo $PATH | sed 's#[^:]*buildinfo/scripts:##' | sed "s#/usr/local/sbin:##") local command=$(PATH=$path which $1) echo $command