From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 23 Feb 2015 12:03:16 +0000 (+0000)
Subject: ts-xen-build: only move hypervisor to xeninstall
X-Git-Tag: wip.libvirt-v3-base~242^2~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=69396f6ded9d8d935d8fadce2ea9caefcda3fd80;p=people%2Fliuw%2Fosstest.git

ts-xen-build: only move hypervisor to xeninstall

... so that we can leave xenpolicy-* in tools tarball.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes in v13:
1. Use find rune to get list of files to move.
---

diff --git a/ts-xen-build b/ts-xen-build
index b61b4ca..e757f68 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -146,6 +146,19 @@ sub collectversions () {
 }
 
 sub divide () {
+    # Only move hv to xeninstall, so that we can have
+    # xenpolicy in tools tarball.
+    #
+    # The files inside boot/ after `make dist' are
+    # xen-$XEN_VERSION: Xen binary
+    # xen.gz/xen: symlink to xen-$XEN_VERSION
+    # xen-$MAJOR: symlink to xen-$XEN_VERSION
+    # xen-$MAJOR.$MINOR: symlink to xen-$XEN_VERSION
+    # xen-sym-$XEN_VERSION: Xen symbol
+    # xenpolicy-$XEN_VERSION: flask policy binary if xsm is enabled
+    #
+    # So the following snippet will leave xenpolicy* in
+    # install/boot and get packaged to tools tarball.
     target_cmd_build($ho, 100, $builddir, <<END);
         cd xen/dist
         mkdir xeninstall
@@ -155,7 +168,8 @@ sub divide () {
         if test -d install/boot; then
             if test -f install/boot/xen.gz || test -f install/boot/xen; then
                 mkdir xeninstall/boot
-                mv install/boot/xen* xeninstall/boot/.
+                mvfiles=`find install/boot -name 'xen[a-z]*' -prune -o -name 'xen*' -print`
+                mv \$mvfiles xeninstall/boot/.
             fi
         fi
 END