starlingx
/
root
Code Issues Proposed changes

Revert "Fix build-srpms-serial audit all srpms issue" 

This reverts commit 90d75a655d.

Change-Id: Ie9e34d36da77f4526e5d8d4bd18cc57e7da449ce
This commit is contained in:
Austin Sun 2018-09-18 09:30:13 +00:00
parent 90d75a655d
commit e429cae247
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-tools/build-srpms-parallel
View File

@ -1428,16 +1428,6 @@ UNRESOLVED_TARGETS=$(for i in $(seq 0 $((max_workers-1))); do
\rm -rf $MY_WORKSPACE/tmp/SRPM_REBUILT_LIST_* $MY_WORKSPACE/tmp/SRPM_FAILED_REBUILD_LIST_* $MY_WORKSPACE/tmp/UNRESOLVED_TARGETS* 2>> /dev/null
cleanup() {
if [ -n "$MY_WORKSPACE/tmp" -a -d "${MY_WORKSPACE}/tmp" ]; then
echo "clean up $MY_WORKSPACE/tmp"
rm -rf $MY_WORKSPACE/tmp
fi
}
# cleanup temp files when system exiting
trap cleanup EXIT
# Try to find and clean orphaned and discontinued .src.rpm's
if [ $ALL -eq 1 ]; then
echo

20
build-tools/build-srpms-serial
View File

@ -1242,23 +1242,11 @@ for GIT_ROOT in $GIT_LIST; do
done
done
AUDIT_DIR=$(mktemp -d $MY_WORKSPACE/tmp-$USER-$ME-audit-XXXXXX)
cleanup() {
if [ -n "$AUDIT_DIR" -a -d "$AUDIT_DIR" ]; then
echo "clean up $AUDIT_DIR"
rm -rf $AUDIT_DIR
fi
}
# cleanup temp files when system exiting
trap cleanup EXIT
# Try to find and clean orphaned and discontinued .src.rpm's
if [ $ALL -eq 1 ]; then
echo
echo "Auditing for obsolete srpms"
PACKAGES_CONSIDERED=""
for GIT_ROOT in $GIT_LIST; do
for p in $(cat $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do
src_dir="$GIT_ROOT/$p"
@ -1268,7 +1256,7 @@ if [ $ALL -eq 1 ]; then
for f in $(find $src_dir/${DISTRO} -name '*.spec' | sort -V); do
NAME=$(spec_find_tag Name "$f" 2>> /dev/null)
if [ $? -eq 0 ]; then
touch "$AUDIT_DIR/$NAME"
PACKAGES_CONSIDERED="$PACKAGES_CONSIDERED $NAME"
fi
done
if [ -f $src_dir/$SRPM_LIST_PATH ]; then
@ -1302,7 +1290,7 @@ if [ $ALL -eq 1 ]; then
if [ -f $ORIG_SRPM_PATH ]; then
NAME=$(rpm -q --queryformat '%{NAME}\n' -p $ORIG_SRPM_PATH 2>> /dev/null)
if [ $? -eq 0 ]; then
touch "$AUDIT_DIR/$NAME"
PACKAGES_CONSIDERED="$PACKAGES_CONSIDERED $NAME"
fi
fi
done
@ -1337,8 +1325,6 @@ if [ $ALL -eq 1 ]; then
fi
fi
done
echo "Delete $AUDIT_DIR"
\rm -rf "$AUDIT_DIR"
fi
echo "Auditing for obsolete srpms done"