hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1242227 - in /hadoop/common/branches/branch-1: CHANGES.txt build.xml src/packages/rpm/spec/hadoop.spec
Date Thu, 09 Feb 2012 06:31:46 GMT
Author: mattf
Date: Thu Feb  9 06:31:45 2012
New Revision: 1242227

URL: http://svn.apache.org/viewvc?rev=1242227&view=rev
Log:
reverting HADOOP-8037

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

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1242227&r1=1242226&r2=1242227&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Feb  9 06:31:45 2012
@@ -187,10 +187,6 @@ Release 1.0.1 - 2012.02.08
     HADOOP-8010. hadoop-config.sh errors when HADOOP_HOME_WARN_SUPPRESS is set 
     to true and HADOOP_HOME is present. (Roman Shaposhnik via mattf)
 
-    HADOOP-8037. Binary tarball does not preserve platform info for native builds,
-    and RPMs fail to provide needed symlinks for libhadoop.so. (Giridharan Kesavan
-    via mattf)
-
 Release 1.0.0 - 2011.12.15
 
   NEW FEATURES

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 06:31:45 2012
@@ -3,7 +3,7 @@
 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
 /hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1174370,1174917,1176042,1176248,1176638,1176645,1200050,1200078,1200199,1202378,1203419,1205530
-/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997,1242072,1242208
+/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997,1242072
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

Modified: hadoop/common/branches/branch-1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1242227&r1=1242226&r2=1242227&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Thu Feb  9 06:31:45 2012
@@ -1618,13 +1618,12 @@
   </target>
 
   <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks,
package-librecordio" 
-               description="assembles artifacts for binary target">
+		description="assembles artifacts for binary target">
+    <delete dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/bin"/>
     <mkdir dir="${dist.dir}/etc/hadoop"/>
     <mkdir dir="${dist.dir}/lib"/>
-    <mkdir dir="${dist.dir}/lib/native"/>
-    <mkdir dir="${dist.dir}/lib/native/${build.platform}"/>
     <mkdir dir="${dist.dir}/libexec"/>
     <mkdir dir="${dist.dir}/sbin"/>
     <mkdir dir="${dist.dir}/share/${name}/contrib"/>
@@ -1655,7 +1654,7 @@
       <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
     </exec>
 
-    <move todir="${dist.dir}/lib/native/${build.platform}" flatten="true">
+    <move todir="${dist.dir}/lib" flatten="true">
       <fileset dir="${dist.dir}/native">
         <include name="*/*"/>
       </fileset>
@@ -1716,7 +1715,7 @@
       </fileset>
     </copy>
 
-    <copy todir="${dist.dir}/lib/native/${build.platform}" includeEmptyDirs="false" flatten="true">
+    <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
       <fileset dir="${build.dir}/c++">
         <include name="**/lib/*"/>
       </fileset>

Modified: hadoop/common/branches/branch-1/src/packages/rpm/spec/hadoop.spec
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/packages/rpm/spec/hadoop.spec?rev=1242227&r1=1242226&r2=1242227&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/packages/rpm/spec/hadoop.spec (original)
+++ hadoop/common/branches/branch-1/src/packages/rpm/spec/hadoop.spec Thu Feb  9 06:31:45
2012
@@ -141,19 +141,6 @@ chmod 0755 ${RPM_BUILD_DIR}/%{_final_nam
 #### INSTALL SECTION ####
 #########################
 %install
-%ifarch i386
-mv  ${RPM_BUILD_DIR}/%{_final_name}/lib/native/%{hadoop_arch}/lib*  ${RPM_BUILD_DIR}%{_lib_dir}
-rm -rf ${RPM_BUILD_DIR}/%{_final_name}/lib
-rm -rf ${RPM_BUILD_DIR}/%{_final_name}/c++
-
-%endif
-
-%ifarch amd64 x86_64
-mv  ${RPM_BUILD_DIR}/%{_final_name}/lib/native/%{hadoop_arch}/lib*  ${RPM_BUILD_DIR}%{_lib64_dir}
-rm -rf ${RPM_BUILD_DIR}/%{_final_name}/lib
-rm -rf ${RPM_BUILD_DIR}/%{_final_name}/c++
-%endif
-
 mv ${RPM_BUILD_DIR}/%{_final_name}/etc/hadoop/* ${RPM_BUILD_DIR}%{_conf_dir}
 mv ${RPM_BUILD_DIR}/%{_final_name}/* ${RPM_BUILD_DIR}%{_prefix}
 



Mime
View raw message