From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST] make-flight: Support specifying a mini-os tree+revision Date: Fri, 11 Dec 2015 13:56:54 +0000 Message-ID: <1449842214-4589-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org This is useful for standalone or adhoc use as well as (presumably) bisection. There is no ap-* or cr-daily-* integration here because I didn't need it (i.e. I'm not intending to create a new mini-os branch here). Signed-off-by: Ian Campbell --- mfi-common | 4 +++- ts-xen-build | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 4ed040e..7b41553 100644 --- a/mfi-common +++ b/mfi-common @@ -187,6 +187,7 @@ create_build_jobs () { tree_xen=$TREE_XEN \ tree_seabios=$TREE_SEABIOS \ tree_ovmf=$TREE_OVMF \ + tree_minios=$TREE_MINIOS \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ $suite_runvars \ host_hostflags=$build_hostflags \ @@ -194,7 +195,8 @@ create_build_jobs () { revision_qemu=$REVISION_QEMU \ revision_qemuu=$REVISION_QEMU_UPSTREAM \ revision_seabios=$REVISION_SEABIOS \ - revision_ovmf=$REVISION_OVMF + revision_ovmf=$REVISION_OVMF \ + revision_minios=$REVISION_MINIOS done if [ x$want_prevxen = xy ] ; then diff --git a/ts-xen-build b/ts-xen-build index b02e737..f421dfa 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -81,6 +81,12 @@ END (nonempty($r{revision_ovmf}) ? <>.config OVMF_UPSTREAM_REVISION='$r{revision_ovmf}' END + (nonempty($r{tree_minios}) ? <>.config MINIOS_UPSTREAM_URL='$r{tree_minios}' +END + (nonempty($r{revision_minios}) ? <>.config MINIOS_UPSTREAM_REVISION='$r{revision_minios}' +END (nonempty($earlyprintk) ? <>.config CONFIG_EARLY_PRINTK=$earlyprintk END @@ -140,11 +146,13 @@ END sub collectversions () { my $tools="$builddir/xen/tools"; + my $extras="$builddir/xen/extras"; store_revision($ho, 'qemu', "$tools/ioemu-dir", 1); store_revision($ho, 'qemu', "$tools/qemu-xen-traditional-dir", 1); store_revision($ho, 'qemuu', "$tools/qemu-xen-dir", 1); store_revision($ho, 'seabios', "$tools/firmware/seabios-dir", 1); store_revision($ho, 'ovmf', "$tools/firmware/ovmf-dir", 1); + store_revision($ho, 'minios', "$extras/mini-os", 1); } sub divide () { -- 2.6.1