incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bm...@apache.org
Subject svn commit: r1311378 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/hadoop/ rpm/hadoop/SPECS/
Date Mon, 09 Apr 2012 19:09:30 GMT
Author: bmahe
Date: Mon Apr  9 19:09:29 2012
New Revision: 1311378

URL: http://svn.apache.org/viewvc?rev=1311378&view=rev
Log:
Revert "BIGTOP-422. Need to start packaging fuse for Hadoop 0.23"
Patch is being reworked upstream.

Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/0001-fix-fuse_dfs-compilation-issues.patch
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/0002-fix-fuse_dfs-compilation.patch
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/0003-fix-dfs-fuse-compile.patch
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2696-plus.patch
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/rpm/hadoop/SPECS/hadoop.spec

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=1311378&r1=1311377&r2=1311378&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
Mon Apr  9 19:09:29 2012
@@ -29,11 +29,6 @@ MAVEN_SKIP_TESTS="-DskipTests -DskipTest
 mvn $BUNDLE_SNAPPY -Dcontainer-executor.conf.dir=/etc/hadoop/conf -Pdist -Pnative -Psrc -Dtar
${MAVEN_SKIP_TESTS} install "$@"
 mvn site site:stage ${MAVEN_SKIP_TESTS} $@
 
-# Build fuse
-pushd hadoop-hdfs-project/hadoop-hdfs/src/contrib/
-  ant
-popd
-
 (cd build ; tar --strip-components=1 -xzvf  ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz)
 (cd build/src ; tar --strip-components=1 -xzvf  ../../hadoop-dist/target/hadoop-${HADOOP_VERSION}-src.tar.gz)
 
@@ -43,6 +38,3 @@ cp -r target/site/* build/share/doc/
 
 # Create a manifest for hadoop client package
 (cd hadoop-client/target/hadoop-client-*/share/hadoop/client/lib ; ls) > build/hadoop-client.list
-
-# Copy fuse output to the build directory
-cp hadoop-hdfs-project/hadoop-hdfs/build/contrib/fuse-dfs/{fuse_dfs,fuse_dfs_wrapper.sh}
build/bin/

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=1311378&r1=1311377&r2=1311378&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
Mon Apr  9 19:09:29 2012
@@ -219,7 +219,7 @@ cp -ra ${BUILD_DIR}/share/hadoop/hdfs/we
 
 # bin
 install -d -m 0755 ${HADOOP_DIR}/bin
-cp -a ${BUILD_DIR}/bin/{hadoop,rcc,fuse_dfs,fuse_dfs_wrapper.sh} ${HADOOP_DIR}/bin
+cp -a ${BUILD_DIR}/bin/{hadoop,rcc} ${HADOOP_DIR}/bin
 install -d -m 0755 ${HDFS_DIR}/bin
 cp -a ${BUILD_DIR}/bin/hdfs ${HDFS_DIR}/bin
 install -d -m 0755 ${YARN_DIR}/bin
@@ -231,9 +231,9 @@ cp -a ${BUILD_DIR}/bin/mapred ${YARN_DIR
 
 # sbin
 install -d -m 0755 ${HADOOP_DIR}/sbin
-cp -a ${BUILD_DIR}/sbin/{hadoop-daemon,hadoop-daemons,slaves}.sh ${HADOOP_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/{hadoop-daemon,hadoop-daemons,slaves,start-all,stop-all}.sh ${HADOOP_DIR}/sbin
 install -d -m 0755 ${HDFS_DIR}/sbin
-cp -a ${BUILD_DIR}/sbin/{distribute-exclude,refresh-namenodes}.sh ${HDFS_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/{distribute-exclude,refresh-namenodes,start-balancer,start-dfs,start-secure-dns,stop-balancer,stop-dfs,stop-secure-dns}.sh
${HDFS_DIR}/sbin
 install -d -m 0755 ${YARN_DIR}/sbin
 cp -a ${BUILD_DIR}/sbin/{yarn-daemon,yarn-daemons}.sh ${YARN_DIR}/sbin
 install -d -m 0755 ${MAPREDUCE_DIR}/sbin
@@ -321,31 +321,3 @@ for file in `cat ${BUILD_DIR}/hadoop-cli
   done
   exit 1
 done
-
-# Install fuse wrapper
-
-fuse_wrapper=${BIN_DIR}/hadoop-fuse-dfs
-cat > $fuse_wrapper << EOF
-#!/bin/bash
-
-/sbin/modprobe fuse
-
-export HADOOP_HOME=\${HADOOP_HOME:-${HADOOP_DIR#${PREFIX}}}
-
-if [ -f /etc/default/hadoop-fuse ]
-then . /etc/default/hadoop-fuse
-fi
-
-export HADOOP_LIBEXEC_DIR=/${SYSTEM_LIBEXEC_DIR#${PREFIX}}
-
-if [ "\${LD_LIBRARY_PATH}" = "" ]; then
-export LD_LIBRARY_PATH=/usr/lib
-for f in \`find \${JAVA_HOME}/jre/lib -name client -prune -o -name libjvm.so -exec dirname
{} \;\`; do
-export LD_LIBRARY_PATH=\$f:\${LD_LIBRARY_PATH}
-done
-fi
-
-env \${HADOOP_HOME}/bin/fuse_dfs \$@
-EOF
-
-chmod 755 $fuse_wrapper

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=1311378&r1=1311377&r2=1311378&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
Mon Apr  9 19:09:29 2012
@@ -160,10 +160,6 @@ Source19: mapreduce.default
 Source20: hdfs.default
 Source21: yarn.default
 Source22: hadoop-layout.sh
-Patch0: 0001-fix-fuse_dfs-compilation-issues.patch
-Patch1: 0002-fix-fuse_dfs-compilation.patch
-Patch2: 0003-fix-dfs-fuse-compile.patch
-Patch3: HDFS-2696-plus.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
 Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
bigtop-utils, zookeeper >= 3.4.0
@@ -341,10 +337,8 @@ The History server keeps records of the 
 %package client
 Summary: Hadoop client side dependencies
 Group: System/Daemons
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-hdfs = %{version}-%{release}
-Requires: %{name}-yarn = %{version}-%{release}
-Requires: %{name}-mapreduce = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, %{name}-hdfs = %{version}-%{release}
+Requires: %{name}-yarn = %{version}-%{release}, %{name}-mapreduce = %{version}-%{release}
 
 %description client
 Installation of this package will provide you with all the dependencies for Hadoop clients.
@@ -352,12 +346,9 @@ Installation of this package will provid
 %package conf-pseudo
 Summary: Hadoop installation in pseudo-distributed mode
 Group: System/Daemons
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-hdfs-namenode = %{version}-%{release}
-Requires: %{name}-hdfs-datanode = %{version}-%{release}
-Requires: %{name}-hdfs-secondarynamenode = %{version}-%{release}
-Requires: %{name}-yarn-resourcemanager = %{version}-%{release}
-Requires: %{name}-yarn-nodemanager = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, %{name}-hdfs-namenode = %{version}-%{release}
+Requires: %{name}-hdfs-datanode = %{version}-%{release}, %{name}-hdfs-secondarynamenode =
%{version}-%{release}
+Requires: %{name}-yarn-resourcemanager = %{version}-%{release}, %{name}-yarn-nodemanager
= %{version}-%{release}
 Requires: %{name}-mapreduce-historyserver = %{version}-%{release}
 
 %description conf-pseudo
@@ -380,37 +371,10 @@ AutoReq: no
 %description libhdfs
 Hadoop Filesystem Library
 
-
-%package fuse
-Summary: Mountable HDFS
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libhdfs = %{version}-%{release}
-Requires: 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.
-
-
-
 %prep
 # %setup -n %{name}-%{hadoop_base_version}-src 
 %setup -n apache-hadoop-common-f616c85
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3
-
-
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME
 # This assumes that you installed Java JDK 5 and set JAVA5_HOME
@@ -662,9 +626,3 @@ fi
 %{_includedir}/hdfs.h
 # -devel should be its own package
 #%doc %{_docdir}/libhdfs-%{hadoop_version}
-
-%files fuse
-%defattr(-,root,root)
-%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



Mime
View raw message