From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v3 13/22] ts-host-install: Set dtbs in the non-special kernel case too. Date: Wed, 24 Jun 2015 16:32:32 +0100 Message-ID: <1435159961-22292-13-git-send-email-ian.campbell@citrix.com> References: <1435159944.28264.295.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1435159944.28264.295.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 Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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 Acked-by: Ian Jackson --- v3: Improved commit message --- ts-host-install | 3 +++ 1 file changed, 3 insertions(+) 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"); }); -- 2.1.4