mfi-common: Fall back to anointed builds in Executive mode

Previously, `make-*-flight' would not work unless FREEBSD_*_BUILDJOB
was set.  Now we use the anointed values if we can find them.

If we can't, mg-anoint retrieve will print a warning.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/mfi-common b/mfi-common
index 17b1b5091ba5e7ba8e59bb8f38007d314a5ad3d1..fddd1ce98052870a66291e100ffd2632c7aa1909 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -130,6 +130,8 @@ set_freebsd_runvars () {
     # 3. Config file FreeBSDDist, FreeBSDVersion: same as 2. except that
     # they are set on the config file.
     #
+    # 4. Look for an anointed build of FreeBSD `master' (Executive only)
+    #
     local envvar="FREEBSD_${arch^^}_BUILDJOB"
     if [ -n "${!envvar}" ]; then
         freebsd_runvars="freebsdbuildjob=${!envvar}"
@@ -147,6 +149,12 @@ set_freebsd_runvars () {
                          freebsd_version=$version"
         return
     fi
+    local anointment="freebsd build master $arch"
+    local flightjob=`./mg-anoint retrieve --tolerate-unprepared "$anointment"`
+    if [ -n "$flightjob" ]; then
+        freebsd_runvars="freebsdbuildjob=${flightjob/ /.}"
+        return
+    fi
 }
 
 create_build_jobs () {