svn commit: r1186521 - in /incubator/bigtop/trunk: bigtop-packages/src/common/hadoop/do-component-build bigtop-packages/src/common/hadoop/install_hadoop.sh bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec bigtop.mk

[rv...@apache.org]

Author: rvs
Date: Wed Oct 19 21:55:52 2011
New Revision: 1186521

URL: http://svn.apache.org/viewvc?rev=1186521&view=rev
Log:
BIGTOP-90. Bump version of Hadoop to 0.20.205.0

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/trunk/bigtop.mk

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build?rev=1186521&r1=1186520&r2=1186521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build Wed Oct 19 21:55:52 2011
@@ -16,7 +16,8 @@
 
 set -ex
 
-ant  \
+# FIXME: the LDFLAGS="-lcrypto" is a workaround for MAPREDUCE-2127
+LDFLAGS="-lcrypto" ant  \
   -Djava5.home=$JAVA5_HOME \
   -Dforrest.home=$FORREST_HOME \
   -Dversion=${HADOOP_VERSION} \

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1186521&r1=1186520&r2=1186521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh Wed Oct 19 21:55:52 2011
@@ -126,7 +126,7 @@ mkdir -p $LIB_DIR
 (cd $BUILD_DIR && tar -cf - .) | (cd $LIB_DIR && tar xf - )
 
 # Take out things we've installed elsewhere
-for x in docs lib/native c++ src conf usr/bin/fuse_dfs contrib/fuse ; do
+for x in docs lib/native c++ src conf usr/bin/fuse_dfs contrib/fuse share 'lib/lib*so*'  ; do
   rm -rf $LIB_DIR/$x 
 done
 
@@ -178,9 +178,9 @@ install -d -m 0755 $ETC_DIR/conf.empty
 (cd $LIB_DIR &&
 for j in hadoop-*.jar; do
   if [[ $j =~ hadoop-(.*)-([^-]+).jar ]]; then
-    ver=${BASH_REMATCH[1]}
-    name=${BASH_REMATCH[2]}
-    ln -s hadoop-$ver-$name.jar hadoop-$name.jar
+    name=${BASH_REMATCH[1]}
+    ver=${BASH_REMATCH[2]}
+    ln -s hadoop-$name-$ver.jar hadoop-$name.jar
   fi
 done)
 
@@ -262,7 +262,7 @@ EOF
   cp -r ./c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
 
   # libhdfs
-  cp ./c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
+  cp ./build/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR
   ln -sf libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR/libhdfs.so.0
 
   # libhdfs-devel - hadoop doesn't realy install these things in nice places :(
@@ -274,7 +274,7 @@ EOF
   #    This is somewhat unintuitive, but the -devel package has this symlink (see Debian Library Packaging Guide)
   ln -sf libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR/libhdfs.so
   sed -e "s|^libdir='.*'|libdir=\"$SYSTEM_LIB_DIR\"|" \
-      ./c++/${NATIVE_BUILD_STRING}/lib/libhdfs.la > $PREFIX/$SYSTEM_LIB_DIR/libhdfs.la
+      ./build/c++/${NATIVE_BUILD_STRING}/lib/libhdfs.la > $PREFIX/$SYSTEM_LIB_DIR/libhdfs.la
 fi
 
 # XXX Hack to get hadoop to get packaged

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1186521&r1=1186520&r2=1186521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Wed Oct 19 21:55:52 2011
@@ -15,6 +15,12 @@
 #
 # Hadoop RPM spec file
 #
+
+# FIXME: we need to disable a more strict checks on native files for now,
+# since Hadoop build system makes it difficult to pass the kind of flags
+# that would make newer RPM debuginfo generation scripts happy.
+%undefine _missing_build_ids_terminate_build
+
 %define hadoop_name hadoop
 %define etc_hadoop /etc/%{name}
 %define config_hadoop %{etc_hadoop}/conf
@@ -113,7 +119,7 @@ Requires: coreutils, /usr/sbin/useradd, 
 Provides: hadoop
 
 %if  %{?suse_version:1}0
-BuildRequires: libfuse2, libopenssl-devel, gcc-c++, ant, ant-nodeps, ant-trax, liblzo-devel
+BuildRequires: libfuse2, libopenssl-devel, gcc-c++, ant, ant-nodeps, ant-trax
 # Required for init scripts
 Requires: sh-utils, insserv
 %endif

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1186521&r1=1186520&r2=1186521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Wed Oct 19 21:55:52 2011
@@ -18,8 +18,8 @@ BIGTOP_VERSION=0.1.0-incubating
 # Hadoop 0.20.0-based hadoop package
 HADOOP_NAME=hadoop
 HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=0.20.2
-HADOOP_PKG_VERSION=0.20.2
+HADOOP_BASE_VERSION=0.20.205.0
+HADOOP_PKG_VERSION=0.20.205.0
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
 HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)