incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1187082 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hadoop/ deb/hadoop/ rpm/hadoop/SPECS/
Date Thu, 20 Oct 2011 22:05:02 GMT
Author: rvs
Date: Thu Oct 20 22:05:01 2011
New Revision: 1187082

URL: http://svn.apache.org/viewvc?rev=1187082&view=rev
Log:
BIGTOP-123. enable hadoop-fuse package

Added:
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs
      - copied, changed from r1187081, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install
      - copied, changed from r1187081, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.dirs
      - copied, changed from r1187081, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.install
      - copied, changed from r1187081, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.install
Removed:
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.install
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/deb/hadoop/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

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=1187082&r1=1187081&r2=1187082&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 Thu Oct 20
22:05:01 2011
@@ -17,13 +17,14 @@
 set -ex
 
 # FIXME: the LDFLAGS="-lcrypto" is a workaround for MAPREDUCE-2127
-LDFLAGS="-lcrypto" ant  \
+# FIXME: the FUSE_HOME="..." and LDFLAGS="-lm" is a workaround for HADOOP-3344
+LDFLAGS="-lcrypto -lm" FUSE_HOME=`pwd`/build/c++/${HADOOP_ARCH} 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 \
+  -Dlibhdfs=1 -Dfusedfs=true -Dcompile.c++=true -Djdiff.build.dir=build/docs/jdiff-cloudera
\
   api-report bin-package compile-contrib package \
   "$@"
 

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=1187082&r1=1187081&r2=1187082&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 Thu Oct 20
22:05:01 2011
@@ -163,7 +163,7 @@ 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 ${SRC_DIR}/contrib/fuse-dfs/fuse_dfs
 
 
 cp -a ${BUILD_SRC_DIR}/* ${SRC_DIR}/
@@ -215,6 +215,11 @@ if [ ! -z "$NATIVE_BUILD_STRING" ]; then
   if [ -d ./src/contrib/fuse-dfs ]; then
     gzip -c < $DISTRO_DIR/hadoop-fuse-dfs.1 > $MAN_DIR/man1/hadoop-fuse-dfs.1.gz
 
+    # Fuse 
+    mkdir -p $LIB_DIR/bin
+    mv  ${BUILD_DIR}/contrib/fuse-dfs/* $LIB_DIR/bin
+    rmdir ${BUILD_DIR}/contrib/fuse-dfs
+
     fuse_wrapper=${BIN_DIR}/hadoop-fuse-dfs
   cat > $fuse_wrapper << EOF
 #!/bin/bash

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control?rev=1187082&r1=1187081&r2=1187082&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Thu Oct 20 22:05:01 2011
@@ -71,17 +71,17 @@ Description: Server-side binaries necess
  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-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

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs (from r1187081,
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.dirs&r1=1187081&r2=1187082&rev=1187082&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install (from
r1187081, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs-devel.install&r1=1187081&r2=1187082&rev=1187082&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.dirs (from r1187081,
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.dirs?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.dirs&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.dirs&r1=1187081&r2=1187082&rev=1187082&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.install (from r1187081,
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.install?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0.install&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs.install&r1=1187081&r2=1187082&rev=1187082&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1187082&r1=1187081&r2=1187082&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Thu Oct 20 22:05:01 2011
@@ -39,7 +39,7 @@ endif
 build: build-stamp
 build-stamp:
 	dh_testdir
-	env HADOOP_VERSION=${hadoop_version} \
+	env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
 		sh debian/do-component-build -Divy.home=`pwd`/debian/.ivy
 	touch $@
 

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=1187082&r1=1187081&r2=1187082&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 Thu Oct 20 22:05:01
2011
@@ -240,21 +240,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
@@ -305,7 +305,7 @@ before continuing operation.
 # This assumes that you installed Java JDK 5 and set JAVA5_HOME
 # This assumes that you installed Forrest and set FORREST_HOME
 
-env HADOOP_VERSION=%{hadoop_version} bash %{SOURCE1}
+env HADOOP_VERSION=%{hadoop_version} HADOOP_ARCH=%{hadoop_arch} bash %{SOURCE1}
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -484,10 +484,13 @@ 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)
+%config(noreplace) /etc/default/hadoop-fuse
+%attr(0755,root,root) %{lib_hadoop}/bin/fuse_dfs
+%attr(0755,root,root) %{lib_hadoop}/bin/fuse_dfs_wrapper.sh
+%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



Mime
View raw message