incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1177143 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-packages/src/common/hadoop/ bigtop-packages/src/deb/hadoop/ bigtop-packages/src/rpm/hadoop/SPECS/
Date Thu, 29 Sep 2011 01:13:44 GMT
Author: rvs
Date: Thu Sep 29 01:13:43 2011
New Revision: 1177143

URL: http://svn.apache.org/viewvc?rev=1177143&view=rev
Log:
Enabling Hadoop 0.23

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.dirs
      - copied, changed from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
      - copied, changed from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.dirs
      - copied, changed from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.install
      - copied, changed from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.install
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.install
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/docs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop.mk

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Thu Sep 29 01:13:43 2011
@@ -16,14 +16,39 @@
 
 set -ex
 
-ant  \
-  -Djava5.home=$JAVA5_HOME \
-  -Dforrest.home=$FORREST_HOME \
-  -Dversion=${HADOOP_VERSION} \
-  -Dcompile.native=true \
-  -Dhadoop.conf.dir=/etc/hadoop/conf \
-  -Dlibhdfs=1 -Dcompile.c++=true -Djdiff.build.dir=build/docs/jdiff-cloudera \
-  api-report bin-package compile-contrib package \
-  "$@"
+# FIXME: there has to be a better way
+(wget http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
+tar xjvf protobuf-2.4.1.tar.bz2
+cd protobuf-2.4.1
+./configure --prefix=`pwd`/root
+make install)
 
-	
+PATH=`pwd`/protobuf-2.4.1/root/bin:$PATH
+export PATH
+
+STITCH_FILES="CHANGES.txt LICENSE.txt NOTICE.txt README.txt"
+
+mkdir build
+rm -f $STITCH_FILES
+
+mvn -Pdist -Pnative -Dtar -DskipTests -DskipITs package  "$@"
+# FIXME: MR should really be part of the above
+(cd hadoop-mapreduce-project ; mvn -Dtar -DskipTests -DskipITs package assembly:single "$@")
+
+(cd build ; tar --strip-components=1 -xzvf  ../hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-0.23.0-SNAPSHOT.tar.gz)
+(cd build ; tar --strip-components=1 -xzvf  ../hadoop-common-project/hadoop-common/target/hadoop-common-0.23.0-SNAPSHOT.tar.gz)
+(cd build ; tar --strip-components=1 -xzvf  ../hadoop-mapreduce-project/target/hadoop-mapreduce-0.23.0-SNAPSHOT-all.tar.gz)
+
+# FIXME: This could be missing MR 
+for file in $STITCH_FILES ; do
+  cat hadoop*project/hadoop*/$file >> $file
+done
+
+# A bunch of workarounds
+cp build/conf/* build/etc/hadoop
+mkdir -p build/contrib/fuse-dfs
+cp build/lib/libhdfs.a build/lib/libhadooppipes.a
+cp build/lib/libhdfs.a build/lib/libhadooputils.a
+rm build/libexec/jsvc
+cp /bin/true build/libexec/jsvc
+cp build/sbin/hadoop-daemon.sh build/bin/hadoop-daemon.sh

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Thu Sep 29 01:13:43 2011
@@ -120,13 +120,12 @@ SRC_DIR=${SRC_DIR:-$PREFIX/usr/src/hadoo
 ETC_DIR=${ETC_DIR:-$PREFIX/etc/hadoop}
 
 INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/hadoop}
-BUILD_SRC_DIR=./src
 
 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 sources conf etc share/doc lib/libhdfs* ; do
   rm -rf $LIB_DIR/$x 
 done
 
@@ -146,35 +145,40 @@ done
 
 # Link examples to /usr/share
 mkdir -p $EXAMPLE_DIR
-for x in $LIB_DIR/*examples*jar ; do
-  INSTALL_LOC=`echo $x | sed -e "s,$LIB_DIR,$INSTALLED_LIB_DIR,"`
-  ln -sf $INSTALL_LOC $EXAMPLE_DIR/
-done
+# FIXME
+#for x in $LIB_DIR/*examples*jar ; do
+#  INSTALL_LOC=`echo $x | sed -e "s,$LIB_DIR,$INSTALLED_LIB_DIR,"`
+#  ln -sf $INSTALL_LOC $EXAMPLE_DIR/
+#done
 # And copy the source
 mkdir -p $EXAMPLE_DIR/src
-cp -a $BUILD_SRC_DIR/examples/* $EXAMPLE_DIR/src
+cp -a $BUILD_DIR/sources/src/examples/* $EXAMPLE_DIR/src
 
 # Install docs
 mkdir -p $DOC_DIR
-cp -r ./docs/* $DOC_DIR
+cp -r $BUILD_DIR/share/doc/* $DOC_DIR
 
 # Install source
 mkdir -p ${SRC_DIR}
-rm -f ${BUILD_SRC_DIR}/contrib/fuse-dfs/src/*.o 
-rm -f ${BUILD_SRC_DIR}/contrib/fuse-dfs/src/fuse_dfs
-rm -rf ${BUILD_SRC_DIR}/contrib/hod
-#rm -f ${SRC_DIR}/contrib/fuse-dfs/fuse_dfs
+rm -f hdfs/src/contrib/fuse-dfs/src/*.o 
+rm -f hdfs/src/contrib/fuse-dfs/src/fuse_dfs
+# rm -rf ${BUILD_SRC_DIR}/contrib/hod
+# rm -f ${SRC_DIR}/contrib/fuse-dfs/fuse_dfs
 
 
-cp -a ${BUILD_SRC_DIR}/* ${SRC_DIR}/
+cp -a $BUILD_DIR/sources ${SRC_DIR}/
 
 # Make the empty config
 install -d -m 0755 $ETC_DIR/conf.empty
-(cd ${BUILD_DIR}/conf && tar cf - .) | (cd $ETC_DIR/conf.empty && tar xf
-)
+(cd ${BUILD_DIR}/etc/hadoop && tar cf - .) | (cd $ETC_DIR/conf.empty && tar
xf -)
+# Overlay the -site files
+(cd $DISTRO_DIR/conf.empty && tar --exclude='.svn' -cf - .) | (cd $ETC_DIR/conf.empty
&& tar -xf -)
 
 # Link the HADOOP_HOME conf, log and pid dir to installed locations
 rm -rf $LIB_DIR/conf
 ln -s ${ETC_DIR#$PREFIX}/conf $LIB_DIR/conf
+mkdir $LIB_DIR/etc
+ln -s ${ETC_DIR#$PREFIX}/conf $LIB_DIR/etc/hadoop
 rm -rf $LIB_DIR/logs
 ln -s /var/log/hadoop $LIB_DIR/logs
 rm -rf $LIB_DIR/pids
@@ -200,7 +204,8 @@ gzip -c < $DISTRO_DIR/hadoop.1 > $MAN_DI
 if [ ! -z "$NATIVE_BUILD_STRING" ]; then
   # Fuse 
   mkdir -p $LIB_DIR/bin
-  if [ -d ./src/contrib/fuse-dfs ]; then
+  if [ -d $BUILD_DIR/contrib/fuse-dfs ]; then
+    ln -s ../contrib/fuse-dfs/fuse_dfs $LIB_DIR/bin/fuse_dfs
     gzip -c < $DISTRO_DIR/hadoop-fuse-dfs.1 > $MAN_DIR/man1/hadoop-fuse-dfs.1.gz
 
     fuse_wrapper=${BIN_DIR}/hadoop-fuse-dfs
@@ -238,31 +243,32 @@ EOF
     chmod 755 $fuse_wrapper
   fi
 
+  # sbin
+  mkdir -p $LIB_DIR/sbin/${NATIVE_BUILD_STRING}
+  mv $LIB_DIR/libexec/jsvc $LIB_DIR/sbin/${NATIVE_BUILD_STRING}
+
   # Native compression libs
-  mkdir -p $LIB_DIR/lib/native/
-  cp -r ${BUILD_DIR}/lib/native/${NATIVE_BUILD_STRING} $LIB_DIR/lib/native/
+  mkdir -p $LIB_DIR/lib/native/${NATIVE_BUILD_STRING}
+  cp ${BUILD_DIR}/lib/lib* $LIB_DIR/lib/native/${NATIVE_BUILD_STRING}
 
   # Pipes
   mkdir -p $PREFIX/$SYSTEM_LIB_DIR $PREFIX/usr/include
-  cp ./c++/${NATIVE_BUILD_STRING}/lib/libhadooppipes.a \
-      ./c++/${NATIVE_BUILD_STRING}/lib/libhadooputils.a \
-      $PREFIX/$SYSTEM_LIB_DIR
-  cp -r ./c++/${NATIVE_BUILD_STRING}/include/hadoop $PREFIX/usr/include/
+  cp ${BUILD_DIR}/lib/libhadooppipes.a ${BUILD_DIR}/lib/libhadooputils.a $PREFIX/$SYSTEM_LIB_DIR
+  cp -r ${BUILD_DIR}/sources/src/c++/pipes/api/hadoop $PREFIX/usr/include/
+  cp -r ${BUILD_DIR}/sources/src/c++/utils/api/hadoop $PREFIX/usr/include/
 
   # libhdfs
-  cp ./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
+  cp ${BUILD_DIR}/lib/libhdfs* $PREFIX/$SYSTEM_LIB_DIR
 
   # libhdfs-devel - hadoop doesn't realy install these things in nice places :(
   mkdir -p $PREFIX/usr/share/doc/libhdfs-devel/examples
 
-  cp ${BUILD_SRC_DIR}/c++/libhdfs/hdfs.h $PREFIX/usr/include/
-  cp ${BUILD_SRC_DIR}/c++/libhdfs/hdfs_*.c $PREFIX/usr/share/doc/libhdfs-devel/examples
+  cp hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h $PREFIX/usr/include/
+  #cp hdfs/src/c++/libhdfs/hdfs_*.c $PREFIX/usr/share/doc/libhdfs-devel/examples
 
   #    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
+  #ln -sf libhdfs.so.0.0.0 $PREFIX/$SYSTEM_LIB_DIR/libhdfs.so
+  sed -ie "s|^libdir='.*'|libdir=\"$SYSTEM_LIB_DIR\"|" $PREFIX/$SYSTEM_LIB_DIR/libhdfs.la
 fi
 
 # XXX Hack to get hadoop to get packaged

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control Thu Sep 29
01:13:43 2011
@@ -56,32 +56,32 @@ Description: Native libraries for Hadoop
  This optional package contains native libraries that increase the performance
  of Hadoop's compression.
 
-#Package: hadoop-sbin
-#Provides: hadoop-sbin
-#Architecture: i386 amd64
-#Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
-#Enhances: hadoop
-#Description: Server-side binaries necessary for secured Hadoop clusters
-# This package contains a setuid program, 'task-controller', which is used for
-# launching MapReduce tasks in a secured MapReduce cluster. This program allows
-# the tasks to run as the Unix user who submitted the job, rather than the
-# Unix user running the MapReduce daemons.
-# .
-# This package also contains 'jsvc', a daemon wrapper necessary to allow
-# DataNodes to bind to a low (privileged) port and then drop root privileges
-# before continuing operation.
-
-#Package: hadoop-fuse
-#Provides: hadoop-fuse
-#Architecture: i386 amd64
-#Depends: ${shlibs:Depends}, hadoop (= ${source:Version}), libfuse2, fuse-utils
-#Enhances: hadoop
-#Description: HDFS exposed over a Filesystem in Userspace
-# These projects (enumerated below) allow HDFS to be mounted (on most flavors 
-# of Unix) as a standard file system using the mount command. Once mounted, the
-#  user can operate on an instance of hdfs using standard Unix utilities such 
-# as 'ls', 'cd', 'cp', 'mkdir', 'find', 'grep', or use standard Posix libraries 
-# like open, write, read, close from C, C++, Python, Ruby, Perl, Java, bash, etc.
+Package: hadoop-sbin
+Provides: hadoop-sbin
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
+Enhances: hadoop
+Description: Server-side binaries necessary for secured Hadoop clusters
+ This package contains a setuid program, 'task-controller', which is used for
+ launching MapReduce tasks in a secured MapReduce cluster. This program allows
+ the tasks to run as the Unix user who submitted the job, rather than the
+ Unix user running the MapReduce daemons.
+ .
+ This package also contains 'jsvc', a daemon wrapper necessary to allow
+ DataNodes to bind to a low (privileged) port and then drop root privileges
+ before continuing operation.
+
+Package: hadoop-fuse
+Provides: hadoop-fuse
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, hadoop (= ${source:Version}), libfuse2, fuse-utils
+Enhances: hadoop
+Description: HDFS exposed over a Filesystem in Userspace
+ These projects (enumerated below) allow HDFS to be mounted (on most flavors 
+ of Unix) as a standard file system using the mount command. Once mounted, the
+  user can operate on an instance of hdfs using standard Unix utilities such 
+ as 'ls', 'cd', 'cp', 'mkdir', 'find', 'grep', or use standard Posix libraries 
+ like open, write, read, close from C, C++, Python, Ruby, Perl, Java, bash, etc.
 
 Package: hadoop-doc
 Provides: hadoop-doc

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/docs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/docs?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/docs (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/docs Thu Sep 29 01:13:43
2011
@@ -2,4 +2,3 @@ CHANGES.txt
 LICENSE.txt
 NOTICE.txt
 README.txt
-README.txt

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs?rev=1177143&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
(added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
Thu Sep 29 01:13:43 2011
@@ -0,0 +1 @@
+/usr/lib/hadoop/sbin

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install?rev=1177143&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
(added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
Thu Sep 29 01:13:43 2011
@@ -0,0 +1 @@
+/usr/lib/hadoop/sbin

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.dirs
(from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.dirs?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.dirs&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs&r1=1177124&r2=1177143&rev=1177143&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
(from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs-devel.install&r1=1177124&r2=1177143&rev=1177143&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.dirs
(from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.dirs?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.dirs&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.dirs&r1=1177124&r2=1177143&rev=1177143&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.install
(from r1177124, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.install?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0.install&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs.install&r1=1177124&r2=1177143&rev=1177143&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Thu Sep 29
01:13:43 2011
@@ -25,7 +25,7 @@ export DH_OPTIONS
 
 
 hadoop_version=${HADOOP_VERSION}
-hadoop_build_path=$(shell pwd)/build/hadoop-${hadoop_version}
+hadoop_build_path=$(shell pwd)/build
 
 ifeq (${DEB_BUILD_ARCH},amd64)
   native_dir=Linux-amd64-64
@@ -47,7 +47,6 @@ clean:  
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp build-stamp
-	ant clean
 
 	dh_clean
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/service-init.d.tpl
Thu Sep 29 01:13:43 2011
@@ -48,12 +48,6 @@ install -d -m 0775 -o root -g hadoop /va
 
 . /etc/default/hadoop
 
-. $HADOOP_HOME/bin/hadoop-config.sh
-
-# FIXME: this needs to be removed once hadoop-config.sh stop clobbering HADOOP_HOME
-. /etc/default/hadoop
-
-
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON_SCRIPT=$HADOOP_HOME/bin/hadoop-daemon.sh
 NAME=hadoop-@HADOOP_DAEMON@

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Thu Sep 29 01:13:43 2011
@@ -234,21 +234,21 @@ AutoReq: no
 The Java source code for Hadoop and its contributed packages. This is handy when
 trying to debug programs that depend on Hadoop.
 
-#%package fuse
-#Summary: Mountable HDFS
-#Group: Development/Libraries
-#Requires: %{name} = %{version}-%{release}, fuse
-#AutoReq: no
-#
-#%if  %{?suse_version:1}0
-#Requires: libfuse2
-#%else
-#Requires: fuse-libs
-#%endif
-#
-#
-#%description fuse
-#These projects (enumerated below) allow HDFS to be mounted (on most flavors of Unix) as
a standard file system using the mount command. Once mounted, the user can operate on an instance
of hdfs using standard Unix utilities such as 'ls', 'cd', 'cp', 'mkdir', 'find', 'grep', or
use standard Posix libraries like open, write, read, close from C, C++, Python, Ruby, Perl,
Java, bash, etc.
+%package fuse
+Summary: Mountable HDFS
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}, fuse
+AutoReq: no
+
+%if  %{?suse_version:1}0
+Requires: libfuse2
+%else
+Requires: fuse-libs
+%endif
+
+
+%description fuse
+These projects (enumerated below) allow HDFS to be mounted (on most flavors of Unix) as a
standard file system using the mount command. Once mounted, the user can operate on an instance
of hdfs using standard Unix utilities such as 'ls', 'cd', 'cp', 'mkdir', 'find', 'grep', or
use standard Posix libraries like open, write, read, close from C, C++, Python, Ruby, Perl,
Java, bash, etc.
 
 %package native
 Summary: Native libraries for Hadoop Compression
@@ -277,9 +277,22 @@ Requires: %{name} = %{version}-%{release
 %description pipes
 Hadoop Pipes Library
 
+%package sbin
+Summary: Binaries for secured Hadoop clusters
+Group: System/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description sbin
+This package contains a setuid program, 'task-controller', which is used for
+launching MapReduce tasks in a secured MapReduce cluster. This program allows
+the tasks to run as the Unix user who submitted the job, rather than the
+Unix user running the MapReduce daemons.
+This package also contains 'jsvc', a daemon wrapper necessary to allow
+DataNodes to bind to a low (privileged) port and then drop root privileges
+before continuing operation.
 
 %prep
-%setup -n %{name}-%{hadoop_base_version}
+%setup -n apache-hadoop-common-e141664
 
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME
@@ -301,7 +314,7 @@ env HADOOP_VERSION=%{hadoop_version} bas
 
 bash %{SOURCE2} \
   --distro-dir=$RPM_SOURCE_DIR \
-  --build-dir=$PWD/build/%{name}-%{version} \
+  --build-dir=$PWD/build \
   --src-dir=$RPM_BUILD_ROOT%{src_hadoop} \
   --lib-dir=$RPM_BUILD_ROOT%{lib_hadoop} \
   --system-lib-dir=%{_libdir} \
@@ -465,10 +478,10 @@ fi
 %defattr(-,root,root)
 %{lib_hadoop}/lib/native
 
-#%files fuse
-#%defattr(-,root,root)
-#%attr(0755,root,root) %{bin_hadoop}/hadoop-fuse-dfs
-#%attr(0755,root,root) %{man_hadoop}/man1/hadoop-fuse-dfs.1.gz
+%files fuse
+%defattr(-,root,root)
+%attr(0755,root,root) %{bin_hadoop}/hadoop-fuse-dfs
+%attr(0755,root,root) %{man_hadoop}/man1/hadoop-fuse-dfs.1.gz
 %config(noreplace) /etc/default/hadoop-fuse
 
 %files pipes
@@ -483,3 +496,10 @@ fi
 %{_includedir}/hdfs.h
 # -devel should be its own package
 %doc %{_docdir}/libhdfs-%{hadoop_version}
+
+%files sbin
+%defattr(-,root,root)
+%dir %{lib_hadoop}/sbin
+%dir %{lib_hadoop}/sbin/%{hadoop_arch}
+# %attr(4754,root,mapred) %{lib_hadoop}/sbin/%{hadoop_arch}/task-controller
+%attr(0755,root,root) %{lib_hadoop}/sbin/%{hadoop_arch}/jsvc

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1177143&r1=1177142&r2=1177143&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Thu Sep 29 01:13:43 2011
@@ -18,12 +18,14 @@ 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.23.0
+HADOOP_PKG_VERSION=0.23.0
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
-HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
+#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+HADOOP_TARBALL_SRC=e141664
+HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
 $(eval $(call PACKAGE,hadoop,HADOOP))
 
 # ZooKeeper



Mime
View raw message