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 632bac7a2456ce9105e2f9ef9c74f48334b51a4e..f734a9cd2cca59f989b178b5162c32c6928626aa 100755 (executable)
--- 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");
     });