starlingx/root
Code Issues Proposed changes

Handle multiple optional dependancies and copy list

Browse Source 
RPMs which are built from a build_srpm.data file may have optional
COPY_LIST_TO_TAR and OPT_DEP_LIST items listed in the file.  These
variables are assumed to be single items by the md5sums_from_input_vars
function used by build-srpms during build-avoidance.

What this means is that listing multiple items are not currently
handled by build-srpms during build-avoidance.

This change handles each item in the variables independently.

Change-Id: I57494d23680b726eb8dca712444c45879897ca50
Signed-off-by: Jason McKenna <jason.mckenna@windriver.com>
Closes-Bug: 1800675
This commit is contained in:
Jason McKenna 2018-10-30 11:16:04 -04:00
parent 0ed04ca11c
commit 331e07254f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,20 +135,20 @@ md5sums_from_input_vars () {
fi
if [ "x$COPY_LIST_TO_TAR" != "x" ]; then
find $(readlink -f "$COPY_LIST_TO_TAR") -type f >> $INPUT_FILES
if [ $? -ne 0 ]; then
>&2 echo "ERROR: $FUNCNAME (${LINENO}): find '$COPY_LIST_TO_TAR' -type f"
return 1
fi
for x in $COPY_LIST_TO_TAR; do
find $(readlink -f $x) -type f >> $INPUT_FILES
if [ $? -ne 0 ]; then
>&2 echo "ERROR: $FUNCNAME (${LINENO}): find '$x' -type f"
return 1
fi
done
fi
fi
if [ "x$OPT_DEP_LIST" != "x" ]; then
find $(readlink -f "$OPT_DEP_LIST") -type f >> $INPUT_FILES 2> /dev/null
if [ $? -ne 0 ]; then
>&2 echo "ERROR: $FUNCNAME (${LINENO}): find '$OPT_DEP_LIST' -type f"
return 1
fi
for x in $OPT_DEP_LIST; do
find $(readlink -f $x) -type f >> $INPUT_FILES 2> /dev/null || true
done
fi
)
if [ $? -eq 1 ]; then