Re: [PATCH v8 1/2] OSSTEST: introduce a raisin build test

[Ian Campbell <ian.campbell@citrix.com>]

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
 }