This is always arch/$karch/boot/$img. Store $img in %archparms and use
%arch_debian2linux to construct the full path as needed.
This makes the $archparams less verbose.
Signed-off-by: Ian Campbell <ian.campb...@citrix.com>
Acked-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
ts-kernel-build | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ts-kernel-build b/ts-kernel-build
index b611b9a..e0429a4 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -42,9 +42,9 @@ selectbuildhost(\@ARGV);
builddirsprops();
my $archparms = {
- 'armhf' => { DefConfig => 'multi_v7', KernelImage =>
'arch/arm/boot/zImage' },
- 'i386' => { KernelImage =>
'arch/x86/boot/bzImage' },
- 'amd64' => { KernelImage =>
'arch/x86/boot/bzImage' }
+ 'armhf' => { DefConfig => 'multi_v7', Image => 'zImage' },
+ 'i386' => { Image => 'bzImage' },
+ 'amd64' => { Image => 'bzImage' }
};
my $parms = $archparms->{ $r{arch} };
@@ -379,7 +379,9 @@ END
sub kinstall () {
my $kernfile= $r{kimagefile};
- $kernfile= $parms->{KernelImage} if !defined $kernfile;
+ my $karch = $arch_debian2linux{$r{arch}};
+ $kernfile = "arch/$karch/boot/$parms->{Image}"
+ if !defined $kernfile;
target_cmd_build($ho, 300, $builddir, <<END);
mkdir -p dist/boot dist/lib/modules
--
2.5.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
