From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH v8 1/2] OSSTEST: introduce a raisin build
	test
Date: Tue, 4 Aug 2015 09:39:32 +0100
Message-ID: <1438677572.31129.43.camel@citrix.com>
References: <alpine.DEB.2.02.1507231749120.28668@kaball.uk.xensource.com>
	<1437670366-29034-1-git-send-email-stefano.stabellini@eu.citrix.com>
	<1438677352.31129.42.camel@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1438677352.31129.42.camel@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, ian.jackson@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

On Tue, 2015-08-04 at 09:35 +0100, Ian Campbell wrote:
> On Thu, 2015-07-23 at 17:52 +0100, Stefano Stabellini wrote:
> > diff --git a/ts-xen-build b/ts-xen-build
> > index e757f68..10fc95b 100755
> > --- a/ts-xen-build
> > +++ b/ts-xen-build
> > @@ -145,36 +145,6 @@ sub collectversions () {
> >      store_revision($ho, 'ovmf', "$tools/firmware/ovmf-dir", 1);
> >  }
> >  
> > -sub divide () {
> 
> FYI this needs rebasing over "Collect xen.efi into xendist and install in
> appropriate place".

The right hunk to the moved function is, I think:

@@ -116,6 +116,13 @@ sub divide_xen_build ($$) {
                 mv \$mvfiles xen$postfix/boot/.
             fi
         fi
+       if test -d $postfix/usr/lib64/efi/; then
+            if test -f $postfix/usr/lib64/efi/xen.efi; then
+                mkdir -p xen$postfix/usr/lib64/efi
+                mvfiles=`find $postfix/usr/lib64/efi -name 'xen[a-z]*' -prune -o -name 'xen*' -print`
+                mv \$mvfiles xen$postfix/usr/lib64/efi/.
+            fi
+       fi
 END
 }