From d36a7d892fae2cec9bf4890a8494b106fd13b357 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Mon, 23 Oct 2017 10:57:00 +0100 Subject: [PATCH] mfi-common: introduce set_freebsd_runvars to mfi-common MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit So that it can also be used by make-hosts-flight. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- mfi-common | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/mfi-common b/mfi-common index 15a6533..a86c87c 100644 --- a/mfi-common +++ b/mfi-common @@ -113,6 +113,37 @@ set_hostos_runvars () { esac } +set_freebsd_runvars () { + # Caller should have done if required: + # local freebsd_runvars + # + # Figure out where are the installer binaries. The order is the + # following: + # + # 1. Env variable FREEBSD__BUILDJOB: use the output from a + # previous build--freebsd. + # + # 2. Env variables FREEBSD_DIST, FREEBSD_VERSION: set before calling + # into make-flight, provide the path to the installer image, the sets + # to install and the version being installed. + # + # 3. Config file FreeBSDDist, FreeBSDVersion: same as 2. except that + # they are set on the config file. + # + local envvar="FREEBSD_${arch^^}_BUILDJOB" + if [ -n "${!envvar}" ]; then + freebsd_runvars="freebsdbuildjob=${!envvar}" + elif [ -n "$FREEBSD_DIST" ] && [ -n "$FREEBSD_VERSION" ]; then + freebsd_runvars="freebsd_distpath=$FREEBSD_DIST/$arch \ + freebsd_version=$FREEBSD_VERSION" + else + local distpath=`getconfig "FreeBSDDist"` + local version=`getconfig "FreeBSDVersion"` + freebsd_runvars="freebsd_distpath=$distpath/$arch \ + freebsd_version=$version" + fi +} + create_build_jobs () { local arch -- 2.39.5