]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
ts-rumpuserxen-build: Cope with rumprun-xen rename
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 4 Feb 2015 14:39:12 +0000 (14:39 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 4 Feb 2015 14:41:21 +0000 (14:41 +0000)
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@eu.citrix.com>
CC: Martin Lucina <martin@lucina.net>
ts-rumpuserxen-build

index 47bcf76ed10701c127eb07f329ced8bc3301ff5e..9e6580a9d6a98cddd36da1423a32dd37b4e04c8b 100755 (executable)
@@ -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() {