From patchwork Wed Oct 29 10:41:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 39744 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC6D824029 for ; Wed, 29 Oct 2014 10:42:43 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id mc6sf1509079lab.11 for ; Wed, 29 Oct 2014 03:42:42 -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=tf2ThCClEn8wbKoTbhQKY4F//PV9Vq7uQvAL7XPDBCc=; b=G/Gx7d16xfgnhjbEFZrXEWtVCJ9PpyAUa6Wl5/b+MIvuYvBGsqZa0tZkDA6GZZELCd ZeGmLxxVqLItmC6lLgRcA4o6N5Tlb+pAANVdxU05MdjJ+q+xf2PvTWcrGAUsmFSFiQj+ av1daEfE7if/RHNv3CG4oQHVvSNMynTZ662ny0bmphTXmPsfIYSKXYr8htyW/1velNTs 4MeYF7nYlC5Y29ukxx1QCsIbsDdyL6cIfjgYHbcIkSDsexp1lqhBF90plxam0/Z8K3of frBVo/AVh4hp7DLeabZq06c2EMFScGxkw+pIgBdcFdK0Q+xGjbBxM2q9je3mfLWiQm+y RJig== X-Gm-Message-State: ALoCoQnnhukxCJl2j3NJz7rLyX2nRE3kpjtlfiRl8c87r5rWtsFIIEwY6k5BSapbA+QgtMPxaZpl X-Received: by 10.112.146.104 with SMTP id tb8mr8991lbb.22.1414579362328; Wed, 29 Oct 2014 03:42:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.133 with SMTP id b5ls166324lah.26.gmail; Wed, 29 Oct 2014 03:42:42 -0700 (PDT) X-Received: by 10.112.140.135 with SMTP id rg7mr10561632lbb.24.1414579362026; Wed, 29 Oct 2014 03:42:42 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ay11si5347701lab.132.2014.10.29.03.42.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id n15so2234696lbi.3 for ; Wed, 29 Oct 2014 03:42:41 -0700 (PDT) X-Received: by 10.152.87.98 with SMTP id w2mr10278924laz.27.1414579361901; Wed, 29 Oct 2014 03:42:41 -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 c5csp633450lbz; Wed, 29 Oct 2014 03:42:41 -0700 (PDT) X-Received: by 10.220.225.74 with SMTP id ir10mr2866136vcb.69.1414579360614; Wed, 29 Oct 2014 03:42:40 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id tq18si2281700vdb.19.2014.10.29.03.42.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:40 -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 1XjQhS-0002PB-Am; Wed, 29 Oct 2014 10:41:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XjQhQ-0002Mu-UP for xen-devel@lists.xen.org; Wed, 29 Oct 2014 10:41:57 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 74/CF-02559-474C0545; Wed, 29 Oct 2014 10:41:56 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1414579314!8540327!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21562 invoked from network); 29 Oct 2014 10:41:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 29 Oct 2014 10:41:55 -0000 X-IronPort-AV: E=Sophos;i="5.04,809,1406592000"; d="scan'208";a="186004711" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Wed, 29 Oct 2014 06:41:47 -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 1XjQhG-00013s-BL; Wed, 29 Oct 2014 10:41:47 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 29 Oct 2014 10:41:46 +0000 From: Ian Campbell To: Date: Wed, 29 Oct 2014 10:41:26 +0000 Message-ID: <1414579302-6692-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414579268.29975.13.camel@citrix.com> References: <1414579268.29975.13.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 04/20] 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.217.172 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 --- v2: Place if on the next line --- ts-host-install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ts-host-install b/ts-host-install index 95ce845..90058e3 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 }