From 90b095185b01df1f074ac15a546c1c7e9928fc20 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 3 Oct 2018 15:55:13 -0400
Subject: [PATCH] Build Avoidance bugs found in final test.

Problems:

1) build avoidance arguements can't be overriden via build-pkgs command
line.  The command line must be processed prior to sourcing
build-avoidance-utils.sh.

2) build_avoidance_fixups is failing to restore rpms to a pre-signed state.

Fixes:

1) Move 'source build-avoidance-utils.sh' below argement parsing.

2) Fix a variable name. It was missed when a prior code review requested
more descriptive variable names.

Change-Id: Iec2eeb7e2a3fb782e08909bea973e2ed7a9706a3
Story: 2002835
Task: 22754
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 build-tools/build-avoidance-utils.sh | 2 +-
 build-tools/build-pkgs-parallel      | 4 +++-
 build-tools/build-pkgs-serial        | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build-tools/build-avoidance-utils.sh b/build-tools/build-avoidance-utils.sh
index d728c760..801ab6db 100644
--- a/build-tools/build-avoidance-utils.sh
+++ b/build-tools/build-avoidance-utils.sh
@@ -727,7 +727,7 @@ build_avoidance_fixups () {
     for rpm_path_post_signing in $(find $MY_WS_BT/rpmbuild/RPMS -type f -name '*.rpm' | grep -v src.rpm); do
 
         rpm_name=$(basename $rpm_path_post_signing)
-        rpm_path_pre_signing=$(find $MY_WS_BT/results -name $b | head -n1)
+        rpm_path_pre_signing=$(find $MY_WS_BT/results -name $rpm_name | head -n1)
         if [ "$rpm_path_pre_signing" != "" ]; then
             md5sum_post_signing=$(md5sum ${rpm_path_post_signing} | cut -d ' ' -f 1)
             md5sum_pre_signing=$(md5sum ${rpm_path_pre_signing} | cut -d ' ' -f 1)
diff --git a/build-tools/build-pkgs-parallel b/build-tools/build-pkgs-parallel
index 55f35b56..9bc0cd40 100755
--- a/build-tools/build-pkgs-parallel
+++ b/build-tools/build-pkgs-parallel
@@ -16,7 +16,6 @@
 BUILD_PKGS_PARALLEL_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
 source "${BUILD_PKGS_PARALLEL_DIR}/git-utils.sh"
-source "${BUILD_PKGS_PARALLEL_DIR}/build-avoidance-utils.sh"
 source "${BUILD_PKGS_PARALLEL_DIR}/spec-utils"
 
 
@@ -112,6 +111,9 @@ if [ $HELP -eq 1 ]; then
     exit 0
 fi
 
+# Don't source until after BUILD_AVOIDANCE_OVERRIDE_* variables are set.
+source "${BUILD_PKGS_PARALLEL_DIR}/build-avoidance-utils.sh"
+
 function my_exit() {
     build-rpms-parallel --std --tmpfs-clean
     build-rpms-parallel --rt --tmpfs-clean
diff --git a/build-tools/build-pkgs-serial b/build-tools/build-pkgs-serial
index a1eb4220..3118e09c 100755
--- a/build-tools/build-pkgs-serial
+++ b/build-tools/build-pkgs-serial
@@ -16,7 +16,6 @@
 BUILD_PKGS_SERIAL_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
 source "${BUILD_PKGS_SERIAL_DIR}/git-utils.sh"
-source "${BUILD_PKGS_SERIAL_DIR}/build-avoidance-utils.sh"
 source "${BUILD_PKGS_SERIAL_DIR}/spec-utils"
 
 
@@ -112,6 +111,9 @@ if [ $HELP -eq 1 ]; then
     exit 0
 fi
 
+# Don't source until after BUILD_AVOIDANCE_OVERRIDE_* variables are set.
+source "${BUILD_PKGS_SERIAL_DIR}/build-avoidance-utils.sh"
+
 function my_exit() {
     build-rpms-parallel --std --tmpfs-clean
     build-rpms-parallel --rt --tmpfs-clean