From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 21 May 2015 09:57:41 +0000 (+0100)
Subject: ts-host-install: Set dtbs in the non-special kernel case too.
X-Git-Tag: wip.libvirt-v3-base~86
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bd1903b4915469381d1ce85c368c26d9dfb429d8;p=people%2Fliuw%2Fosstest.git

ts-host-install: Set dtbs in the non-special kernel case too.

When DTB support was added for armhf it required a backports kernel
for use with Wheezy and therefore DTBs were only collected for that
special case. However as we move forward to newer kernels it should
be possible to run using the proper kernel (e.g. Jessie should work
for armhf). Therefore we will need the DTBs for those kernels too.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: Improved commit message
---

diff --git a/ts-host-install b/ts-host-install
index 632bac7..f734a9c 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -255,6 +255,9 @@ END
 	    if -e "$ho->{Tftp}{Path}/$d_i/$kp-dtbs";
     }
 
+    $xopts{dtbs} = "/$d_i/dtbs"
+	if !$xopts{dtbs} && -e "$ho->{Tftp}{Path}/$d_i/dtbs";
+
     file_simple_write_contents("$initrd_overlay.cpio", sub {
         contents_make_cpio($_[0], 'newc', "$initrd_overlay.d");
     });