From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 4/8] ts-kernel-build: Refactor $archparams KernelImage handling Date: Fri, 2 Oct 2015 10:26:14 +0100 Message-ID: <1443777978-11119-4-git-send-email-ian.campbell@citrix.com> References: <1443777956.11707.61.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1443777956.11707.61.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- ts-kernel-build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 8443754..7240b5e 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, <