svn commit: r1302077 - in /hadoop/common/branches/branch-1: CHANGES.txt build.xml

[ma...@apache.org]

Author: mattf
Date: Sun Mar 18 07:06:58 2012
New Revision: 1302077

URL: http://svn.apache.org/viewvc?rev=1302077&view=rev
Log:
HADOOP-8090. rename hadoop 64 bit rpm/deb package name. Contributed by Giridharan Kesavan.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1/build.xml

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1302077&r1=1302076&r2=1302077&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Mar 18 07:06:58 2012
@@ -183,6 +183,9 @@ Release 1.0.2 - unreleased
     HADOOP-5450. Add support for application-specific typecodes to typed
     bytes. (Klaas Bosteels via acmurthy) 
 
+    HADOOP-8090. rename hadoop 64 bit rpm/deb package name. (Giridharan Kesavan
+    via mattf)
+
   BUG FIXES
 
     HADOOP-8050. Deadlock in metrics. (Kihwal Lee via mattf)

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1.0/CHANGES.txt:r1302076

Modified: hadoop/common/branches/branch-1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1302077&r1=1302076&r2=1302077&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Sun Mar 18 07:06:58 2012
@@ -1795,7 +1795,7 @@
     <copy todir="${system-test-build-dir}/${final.name}"
       file="${system-test-build-dir}/${test.final.name}.jar" overwrite="true"/>
     <macro_tar 
-      param.destfile="${system-test-build-dir}/${final.name}-${os.arch}-bin.tar.gz">
+      param.destfile="${system-test-build-dir}/${final.name}-${os-arch}-bin.tar.gz">
         <param.listofitems>
           <tarfileset dir="${system-test-build-dir}" mode="664">
             <exclude name="${final.name}/bin/*" />
@@ -1811,7 +1811,7 @@
   </target>
   
   <target name="binary" depends="bin-package" description="Make platform-specific binary tarball without source and documentation">
-    <macro_tar param.destfile="${build.dir}/${final.name}-${os.arch}-bin.tar.gz">
+    <macro_tar param.destfile="${build.dir}/${final.name}-${os-arch}-bin.tar.gz">
       <param.listofitems>
         <tarfileset dir="${build.dir}" mode="664">
           <exclude name="${final.name}/bin/*" />
@@ -1841,14 +1841,14 @@
     </macro_tar>
     <copy todir="${package.buildroot}/SOURCES">
       <fileset dir="${build.dir}">
-        <include name="${final.name}-${os.arch}-bin.tar.gz" />
+        <include name="${final.name}-${os-arch}-bin.tar.gz" />
       </fileset>
     </copy>
     <copy file="${src.dir}/packages/rpm/spec/hadoop.spec" todir="${package.buildroot}/SPECS">
       <filterchain>
         <replacetokens>
           <token key="final.name" value="${final.name}" />
-          <token key="build.arch" value="${os.arch}" />
+          <token key="build.arch" value="${os-arch}" />
           <token key="version" value="${hadoop.version}" />
           <token key="package.release" value="${package.release}" />
           <token key="package.build.dir" value="${package.build.dir}" />
@@ -1859,7 +1859,7 @@
         </replacetokens>
       </filterchain>
     </copy>
-    <rpm specFile="hadoop.spec" command="-bb --target ${os.arch}" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"/>
+    <rpm specFile="hadoop.spec" command="-bb --target ${os-arch}" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"/>
     <copy todir="${build.dir}/" flatten="true">
       <fileset dir="${package.buildroot}/RPMS">
         <include name="**/${name}*.rpm" />
@@ -1903,7 +1903,7 @@
         </replacetokens>
       </filterchain>
     </copy>
-    <deb destfile="${package.buildroot}/${name}_${hadoop.version}-${package.release}_${os.arch}.deb" control="${package.build.dir}/hadoop.control">
+    <deb destfile="${package.buildroot}/${name}_${hadoop.version}-${package.release}_${os-arch}.deb" control="${package.build.dir}/hadoop.control">
       <tarfileset dir="${build.dir}/${final.name}" filemode="644" prefix="${package.prefix}">
         <exclude name="bin/*" />
         <exclude name="sbin/*" />