[Xen-devel] [OSSTEST PATCH] ts-rumpuserxen-build: Cope with rumprun-xen rename

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

rumpxen-app-* has been renamed to rumprun-xen-*.  We need to cope with
either, at least for the transition.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CC: Martin Lucina <martin@xxxxxxxxxx>
---
 ts-rumpuserxen-build |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ts-rumpuserxen-build b/ts-rumpuserxen-build
index 47bcf76..9e6580a 100755
--- a/ts-rumpuserxen-build
+++ b/ts-rumpuserxen-build
@@ -98,9 +98,14 @@ END
 }
 
 sub recordtools() {
-    my $apptool = "$rux/app-tools/rumpxen-app";
-    store_runvar('cmdprefix_configure', "$apptool-configure");
-    store_runvar('cmdprefix_make',      "$apptool-make");
+    foreach my $stem (qw(rumprun-xen rumpxen-app)) {
+       my $apptool = "$rux/app-tools/$stem";
+       next unless target_file_exists($ho, "$apptool-configure");
+       store_runvar('cmdprefix_configure', "$apptool-configure");
+       store_runvar('cmdprefix_make',      "$apptool-make");
+       return;
+    }
+    die "app-tools not found ($rux)";
 }
 
 sub install() {
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel