The set_freebsd_runvars helper in mfi-common is a superset of the
original function present in make-freebsd-flight, and will attempt to
fetch the last anointed FreeBSD build as a last resort option if no
FreeBSD build is signaled from the FreeBSD env vars. There's no reason
to have this duplication, since the set_freebsd_runvars in mfi-common
is perfectly suitable to be used by make-freebsd-flight.
This duplication was wrongly introduced by d36a7d892f by adding a
set_freebsd_runvars to mfi-common without removing the original
function in make-freebsd-flight.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
Acked-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
Changes since v1:
- Add commit message.
---
make-freebsd-flight | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/make-freebsd-flight b/make-freebsd-flight
index 66d4b816..1a2b359c 100755
--- a/make-freebsd-flight
+++ b/make-freebsd-flight
@@ -36,37 +36,6 @@ job_create_build_filter_callback () {
:
}
-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_<arch>_BUILDJOB: use the output from a
- # previous build-<arch>-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.
- #
- 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
- distpath=`getconfig "FreeBSDDist"`
- version=`getconfig "FreeBSDVersion"`
- freebsd_runvars="freebsd_distpath=$distpath/$arch \
- freebsd_version=$version"
- fi
-}
-
for arch in "$arches"; do
set_freebsd_runvars
job_create_build build-$arch-freebsd build-freebsd \
--
2.17.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
