From 4c35fae49e080ff391d7244318e4748d33e62233 Mon Sep 17 00:00:00 2001
From: Edison Su <edison.su@citrix.com>
Date: Sun, 21 Oct 2012 00:01:15 -0700
Subject: [PATCH] switch to ant target to create cloud-scripts.tgz, as there is
 assumption that the owner of files in this tgz is root.

---
 build/build-cloud.xml |  2 -
 console-proxy/pom.xml |  2 +-
 patches/pom.xml       | 85 +++++++++++++++++++++++++++----------------
 3 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 1b25fac8796..c31d00da220 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -527,8 +527,6 @@
     </tar>
     <copy file="${base.dir}/patches/systemvm/debian/config/root/.ssh/authorized_keys" todir="${dist.dir}/"/>
     <gzip destfile="${dist.dir}/cloud-scripts.tgz" src="${dist.dir}/patch.tar"/>
-    <delete file="${dist.dir}/patch.tar"/>
-    <delete dir="${dist.dir}/build-patch"/>
   </target>
 
   <target name="help">
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index ef1667b2821..fc758cd04cc 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -143,7 +143,7 @@
             </goals>
             <configuration>
               <target>
-                <copy overwrite="true" file="../patches/target/cloud-scripts.tar.gz" tofile="${basedir}/dist/cloud-scripts.tgz"/>  
+                <copy overwrite="true" file="../patches/target/cloud-scripts.tgz" tofile="${basedir}/dist/cloud-scripts.tgz"/>  
               </target>
             </configuration>
           </execution>
diff --git a/patches/pom.xml b/patches/pom.xml
index f8e9b610e41..ca34607f9cc 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -1,22 +1,15 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific 
+  language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-patches</artifactId>
   <name>Apache CloudStack SystemVM Patches</name>
@@ -67,22 +60,52 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <finalName>cloud-scripts</finalName>
-          <appendAssemblyId>false</appendAssemblyId>
-          <descriptors>
-            <descriptor>cloudpatch-descriptor.xml</descriptor>
-          </descriptors>
-        </configuration>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
         <executions>
           <execution>
-            <id>make-cloud-scripts</id>
-            <phase>package</phase>
+            <id>build-cloud-scripts</id>
+            <phase>install</phase>
             <goals>
-              <goal>single</goal>
+              <goal>run</goal>
             </goals>
+            <configuration>
+              <target>
+                <mkdir dir="${basedir}/target/build-patch" />
+                <mkdir dir="${basedir}/target/build-patch/usr/sbin" />
+                <copy overwrite="true" todir="${basedir}/target/build-patch">
+                  <fileset dir="${basedir}/systemvm/debian/config/">
+                    <include name="**/*" />
+                  </fileset>
+                  <fileset dir="${basedir}/systemvm/debian/vpn/">
+                    <include name="**/*" />
+                  </fileset>
+                  <fileset dir="${basedir}/systemvm/debian/xe/">
+                    <include name="**/*" />
+                    <exclude name="**/xe-*" />
+                    <exclude name="**/xen-*" />
+                  </fileset>
+                </copy>
+                <copy overwrite="true" todir="${basedir}/target/build-patch/usr/sbin/">
+                  <fileset dir="${basedir}/systemvm/debian/xe/">
+                    <include name="**/xe-*" />
+                    <include name="**/xen-*" />
+                  </fileset>
+                </copy>
+                <tar destfile="${basedir}/target/patch.tar">
+                  <tarfileset dir="${basedir}/target/build-patch/"
+                    filemode="755">
+                    <include name="**/*" />
+                    <exclude name="**/.classpath" />
+                    <exclude name="**/.project" />
+                    <exclude name="**/wscript_build" />
+                  </tarfileset>
+                </tar>
+                <gzip destfile="${basedir}/target/cloud-scripts.tgz" src="${basedir}/target/patch.tar" />
+                <delete dir="${basedir}/target/build-patch" />
+                <delete file="${basedir}/target/patch.tar" />
+              </target>
+            </configuration>
           </execution>
         </executions>
       </plugin>