starlingx/root
Code Issues Proposed changes

Eliminate intermediate .tox files during build

Browse Source 
The symlinks under .tox were being included for md5sum
calculations.

The md5sum calculations would report an error when a file containing
a space was encountered (which can happen in some .tox libraries such
as setuptools

Change-Id: Ib9bfe55a66e1f27b1e39596b14303c0ef00852c6
Signed-off-by: albailey <Al.Bailey@windriver.com>
This commit is contained in:
albailey 2020-08-27 11:01:45 -05:00
parent 4ce7faa4bc
commit e2bcb4c6c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-tools/build-srpms-common.sh
View File

@ -94,7 +94,7 @@ md5sums_from_input_vars () {
fi
# Remove $MY_REPO prefix from paths
cat $INPUT_FILES_SORTED | xargs md5sum | sed "s# $(readlink -f $MY_REPO)/# #"
cat $INPUT_FILES_SORTED | xargs -d '\n' md5sum | sed "s# $(readlink -f $MY_REPO)/# #"
if [ $TMP_FLAG -eq 0 ]; then
\rm -f $INPUT_FILES_SORTED

4
build-tools/srpm-utils
View File

@ -3411,8 +3411,8 @@ srpm_source_file_list () {
# Create lists of input files (INPUT_FILES) and symlinks (INPUT_LINKS).
# First elements are absolute paths...
while read path; do
find "${path}" -type f | grep -v -e '[/][.]git$' -e '[/][.]git[/]' >> $INPUT_FILES
find "${path}" -type l | grep -v -e '[/][.]git$' -e '[/][.]git[/]' >> $INPUT_LINKS
find "${path}" -type f | grep -v -e '[/][.]git$' -e '[/][.]git[/]' -e '[/][.]tox[/]' >> $INPUT_FILES
find "${path}" -type l | grep -v -e '[/][.]git$' -e '[/][.]git[/]' -e '[/][.]tox[/]' >> $INPUT_LINKS
done < "${INPUT_SOURCES}"
# Create sorted, unique list of canonical paths