Verify sandbox build during hb prime before proceeding.

hb prime was not comparing the sandbox driver to bbuild value
before runing hbDistribute.  This can lead to confusing errors
if the hostboot content has requirements on what FSP drivers
can be used.  I've made the hb prime checking the same as hb
startsimics to avoid this confusion.

Change-Id: If491900fe944537deed93957527a6cb939a6c86e
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1568
Tested-by: Jenkins Server
Reviewed-by: Terry J. Opie <opiet@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 18 insertions, 8 deletions

diff --git a/src/build/tools/hb b/src/build/tools/hb
index f605f5c9e..2ebebc134 100755
--- a/src/build/tools/hb
+++ b/src/build/tools/hb
@@ -258,16 +258,26 @@ hb_workon()
 
 hb_prime()
 {
-    if [ -n "${SANDBOXBASE}" ]; then
-        if [ ! -d "${SANDBOXBASE}" ]; then
-            echo "Sandbox does not exist.  Create with 'hb simsetup."
-            exit -1
-        fi
-        hbDistribute $*
-    else
-        echo "SANDBOXBASE not set."
+    [ -z "${SANDBOXBASE}" ] && echo "Missing SANDBOXBASE." && exit -1
+    [ -z "${HOSTBOOTROOT}" ] && echo "Missing HOSTBOOTROOT." && exit -1
+
+    if [ ! -d "${SANDBOXBASE}" ]; then
+        echo "Sandbox does not exist.  Create with 'hb simsetup."
         exit -1
     fi
+
+    SBDRIVER=`cat ${SANDBOXBASE}/rc_files/sb.conf | \
+              grep "backing_build" | awk '{ print $3 }'`
+    DRIVER=`cat ${HOSTBOOTROOT}/src/build/citest/etc/bbuild`
+
+    if [ ${SBDRIVER} != ${DRIVER} ]; then
+        echo "Driver mismatch between sandbox and src/build/citest/etc/bbuild."
+        echo "Sandbox at ${SBDRIVER}"
+        echo "Update sandbox with 'hb simsetup'."
+        exit -1
+    fi
+
+    hbDistribute $*
 }
 
 hb_simsetup()