From b5f25ca89b6791f7ea07862d302bccca43018d85 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Feb 2015 14:39:12 +0000 Subject: [PATCH] ts-rumpuserxen-build: Cope with rumprun-xen rename rumpxen-app-* has been renamed to rumprun-xen-*. We need to cope with either, at least for the transition. Signed-off-by: Ian Jackson CC: Martin Lucina --- 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() { -- 2.39.5