matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix docker-sonic-mgmt reproducible related issue. (#9647)

Browse Source 
Reproducible build script breaks docker-sonic-mgmt build.
This commit is contained in:
Shilong Liu 2022-01-05 11:54:19 +08:00 committed by Qi Luo
parent 9de6b2ca12
commit c49206a884
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sonic-build-hooks/scripts/buildinfo_base.sh
View File

@ -18,6 +18,12 @@ DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
URL_PREFIX=$(echo "${PACKAGE_URL_PREFIX}" | sed -E "s#(//[^/]*/).*#\1#") URL_PREFIX=$(echo "${PACKAGE_URL_PREFIX}" | sed -E "s#(//[^/]*/).*#\1#")
if [ $USER != 'root' ] && [ -n $(which sudo) ];then
SUDO=sudo
else
SUDO=''
fi
log_err() log_err()
{ {
echo "$1" >> $LOG_PATH/error.log echo "$1" >> $LOG_PATH/error.log
@ -73,7 +79,7 @@ set_reproducible_mirrors()
local mirrors="/etc/apt/sources.list $(find /etc/apt/sources.list.d/ -type f)" local mirrors="/etc/apt/sources.list $(find /etc/apt/sources.list.d/ -type f)"
for mirror in $mirrors; do for mirror in $mirrors; do
sed -i "$expression" "$mirror" $SUDO sed -i "$expression" "$mirror"
done done
} }
@ -162,7 +168,7 @@ run_pip_command()
install=y install=y
elif [[ "$para" == *.whl ]]; then elif [[ "$para" == *.whl ]]; then
package_name=$(echo $para | cut -d- -f1 | tr _ .) package_name=$(echo $para | cut -d- -f1 | tr _ .)
sed "/^${package_name}==/d" -i $tmp_version_file $SUDO sed "/^${package_name}==/d" -i $tmp_version_file
fi fi
done done