From patchwork Fri Oct 10 12:02:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 38566 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 686BE202DB for ; Fri, 10 Oct 2014 12:03:32 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b15sf2122451eek.0 for ; Fri, 10 Oct 2014 05:03:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=7vZLtKqIPZOv647y5QuUbPhSn86zKFi1aYLaivO3bNI=; b=CL2sjNWEIAzAF6pE1anHC8PZSZFrxDZe1z2PO0krwoXaGLpt6ayWchdUH4l5108omt Jfumbc1rnI/tQvYLhF14uH4Brtaa3NAaxvFzihvduBDqkFdN2kbj+1USzFlHUvcN8sNu 7LI5Qzr9iUT03k4uJgdA/OeWNS68fBBM0JzUKB7sxzlo9h5s7yo1C0Txvz+FrPXfT79B GBcQDza5h+yebwRDYsLFJ+MjOO93zMkqOxbp4Maw2CtnKwSJHIKRXRE5W01bV0QmtNh7 k4Q4RbDSvpH3UvKamCbNx8EHQdyYRt53n713W5LzxemDFN+7SqeuSuGDA8ESZoRGGF7A /QXQ== X-Gm-Message-State: ALoCoQmaN1NslzapEAf4gGEwUdU+y1iLIT+BwT+oJQjeebV81Kr+xtzKvZOSzZcgo8XKLvneXM/N X-Received: by 10.180.79.34 with SMTP id g2mr974031wix.2.1412942611574; Fri, 10 Oct 2014 05:03:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.132 with SMTP id c4ls249657lac.88.gmail; Fri, 10 Oct 2014 05:03:31 -0700 (PDT) X-Received: by 10.112.34.78 with SMTP id x14mr4231729lbi.38.1412942611292; Fri, 10 Oct 2014 05:03:31 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by mx.google.com with ESMTPS id d7si8986015laa.24.2014.10.10.05.03.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gi9so3045794lab.7 for ; Fri, 10 Oct 2014 05:03:30 -0700 (PDT) X-Received: by 10.112.14.34 with SMTP id m2mr4158740lbc.74.1412942610801; Fri, 10 Oct 2014 05:03:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp414299lbz; Fri, 10 Oct 2014 05:03:29 -0700 (PDT) X-Received: by 10.140.82.100 with SMTP id g91mr7835082qgd.30.1412942608947; Fri, 10 Oct 2014 05:03:28 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h94si10704625qgd.66.2014.10.10.05.03.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 05:03:28 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XcYuB-0002KB-OX; Fri, 10 Oct 2014 12:02:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XcYuA-0002Jc-7I for xen-devel@lists.xen.org; Fri, 10 Oct 2014 12:02:42 +0000 Received: from [85.158.143.35:40358] by server-1.bemta-4.messagelabs.com id 1D/EC-05872-1EAC7345; Fri, 10 Oct 2014 12:02:41 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1412942558!11748672!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9251 invoked from network); 10 Oct 2014 12:02:41 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Oct 2014 12:02:41 -0000 X-IronPort-AV: E=Sophos;i="5.04,691,1406592000"; d="scan'208";a="181281185" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 10 Oct 2014 08:02:40 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XcYu7-0008TN-3m; Fri, 10 Oct 2014 13:02:40 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 10 Oct 2014 13:02:39 +0100 From: Ian Campbell To: Date: Fri, 10 Oct 2014 13:02:20 +0100 Message-ID: <1412942554-752-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412942404.27111.12.camel@citrix.com> References: <1412942404.27111.12.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH RFC OSSTEST 05/19] ts-host-install: Add fdtdir to PXE stanza if dtbs directory exists X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: u-boot's pxe client uses this together with $fdtfile in its local environment to automatically load the fdt when pxe booting. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- ts-host-install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ts-host-install b/ts-host-install index 95ce845..ca26f95 100755 --- a/ts-host-install +++ b/ts-host-install @@ -188,6 +188,9 @@ SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="$ho->{Ether}", A END } + my $dtbs = "fdtdir /$d_i/dtbs" if + -e "$ho->{Tftp}{Path}/$d_i/dtbs"; + file_simple_write_contents("$initrd_overlay.cpio", sub { contents_make_cpio($_[0], 'newc', "$initrd_overlay.d"); }); @@ -222,6 +225,7 @@ label overwrite kernel $kernel append $installcmdline ipappend $ipappend + $dtbs default overwrite END }