From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 8/8] Debian: Use dtbs from kernel dist when booting that kernel Date: Fri, 2 Oct 2015 10:26:18 +0100 Message-ID: <1443777978-11119-8-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 The kernel dist built by ts-kernel-build puts the corresponding dtbs into /boot/dtbs/$kvers. The host installers dtbs remain in /boot/dtbs and are used when booting the native kernel. It's possible that this change will expose bugs which exist in the DTBs in previous kernel branches (3.18 and 4.1). I've not investigated, I think we should accept this possibility and deal with it via backport requests (and maybe some force pushes if appropriate) as necessary. Signed-off-by: Ian Campbell --- Osstest/Debian.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 75fd7bf..4df1b74 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -141,11 +141,14 @@ sub uboot_common_kernel_bootargs ($) return @bootargs; } -sub uboot_scr_load_dtb () { +sub uboot_scr_load_dtb (;$) { + my ($kvers) = @_; + $kvers ||= ''; + $kvers .= '/' if $kvers; return <