@@ -42,6 +42,7 @@ BEGIN {
xendist
$xendist
+ collect_xen_built_versions
submodulefixup submodule_have submodule_find
@@ -84,6 +85,17 @@ sub xendist () {
($ho, 'xendist', '', $r{"buildjob"});
}
+sub collect_xen_built_versions () {
+ 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);
+}
+
#----- submodules -----
sub submodulefixup ($$$$) {
@@ -151,17 +151,6 @@ 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 () {
# Only move hv to xeninstall, so that we can have
# xenpolicy in tools tarball.
@@ -248,7 +237,7 @@ sub trapping ($) {
checkout();
trapping(\&build);
-trapping(\&collectversions);
+trapping(\&collect_xen_built_versions);
die "*** something failed:\n\n".(join "\n\n",@probs)."\n** something failed"
if @probs;