You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/31 19:08:29 UTC
svn commit: r1195586 - in
/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src:
common/hadoop/do-component-build common/hadoop/install_hadoop.sh
deb/hadoop/hadoop-sbin.install deb/hadoop/rules rpm/hadoop/SPECS/hadoop.spec
Author: rvs
Date: Mon Oct 31 18:08:29 2011
New Revision: 1195586
URL: http://svn.apache.org/viewvc?rev=1195586&view=rev
Log:
Cleaning up Hadoop build
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build?rev=1195586&r1=1195585&r2=1195586&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build Mon Oct 31 18:08:29 2011
@@ -16,7 +16,7 @@
set -ex
-STITCH_FILES="CHANGES.txt README.txt"
+STITCH_FILES="CHANGES.txt LICENSE.txt NOTICE.txt README.txt"
WORKDIR=hadoop-$HADOOP_VERSION
@@ -73,6 +73,14 @@ for dir in docs; do
done
done
+# munge the contrib directories
+for dir in contrib; do
+ mkdir $dir
+ for proj in hdfs mapred; do
+ cp -Rp $proj/$dir/* $dir
+ done
+done
+
# munge the bin and conf directories
for dir in bin conf; do
mkdir $dir
@@ -108,7 +116,14 @@ done
# get our jar files
mv {common,hdfs,mapred}/*.jar .
+# remove native build files
+rm `find . -type f | egrep "\.(P|)o$"`
+
# tar up the result
cd ..
-tar czf "hadoop-$HADOOP_VERSION.tar.gz" "hadoop-$HADOOP_VERSION"
+tar czf hadoop-$HADOOP_VERSION.tar.gz hadoop-$HADOOP_VERSION
mv hadoop-$HADOOP_VERSION build
+
+# FIXME: this is a hack for shv
+[ -d ../../RPMS ] && mv hadoop-$HADOOP_VERSION.tar.gz ../../RPMS
+[ -d ../../../output ] && mv hadoop-$HADOOP_VERSION.tar.gz ../../../output
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1195586&r1=1195585&r2=1195586&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/install_hadoop.sh Mon Oct 31 18:08:29 2011
@@ -125,7 +125,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 contrib/fuse-dfs/fuse_dfs usr/bin/fuse_dfs contrib/fuse share sbin/task-controller 'lib/lib*so*' 'lib/lib*a' ; do
+for x in docs lib/native c++ src conf share sbin/task-controller hdfs/src/contrib/fuse-dfs/src/fuse_dfs 'lib/lib*so*' 'lib/lib*a' ; do
rm -rf $LIB_DIR/$x
done
@@ -169,7 +169,7 @@ mkdir -p ${SRC_DIR}
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 hdfs/contrib/fuse-dfs/fuse_dfs
+# rm -f hdfs/contrib/fuse-dfs/fuse_dfs
cp -a mapreduce/src/* hdfs/src/* common/src/* ${SRC_DIR}/
@@ -185,10 +185,16 @@ install -d -m 0755 $ETC_DIR/conf.empty
# packages can depend on
(cd $LIB_DIR &&
for j in hadoop-*.jar; do
- if [[ $j =~ hadoop-(.*)-([^-]+).jar ]]; then
- name=${BASH_REMATCH[1]}
- ver=${BASH_REMATCH[2]}
- ln -s hadoop-$name-$ver.jar hadoop-$name.jar
+ if [[ $j =~ hadoop-([^-]+)-([^-]+)-([0-9].*)-sources.jar ]]; then
+ comp=${BASH_REMATCH[1]}
+ name=${BASH_REMATCH[2]}
+ vers=${BASH_REMATCH[3]}
+ ln -s hadoop-$comp-$name-$vers-sources.jar hadoop-$comp-$name-sources.jar
+ elif [[ $j =~ hadoop-([^-]+)-([^-]+)-([0-9].*).jar ]]; then
+ comp=${BASH_REMATCH[1]}
+ name=${BASH_REMATCH[2]}
+ vers=${BASH_REMATCH[3]}
+ ln -s hadoop-$comp-$name-$vers.jar hadoop-$comp-$name.jar
fi
done)
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/hadoop-sbin.install?rev=1195586&r1=1195585&r2=1195586&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/hadoop-sbin.install (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/hadoop-sbin.install Mon Oct 31 18:08:29 2011
@@ -1,2 +1,2 @@
/usr/lib/hadoop/sbin
-/usr/lib/hadoop/libexec/jsvc*
+/usr/lib/hadoop/bin/jsvc*
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules?rev=1195586&r1=1195585&r2=1195586&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hadoop/rules Mon Oct 31 18:08:29 2011
@@ -97,9 +97,11 @@ install-indep: namenode secondarynamenod
rm -Rf debian/hadoop/usr/lib/hadoop/bin/fuse_dfs
rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs
+ rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/contrib/fuse-dfs
# FIXME: The following is a workaround for BIGTOP-139
- rm -Rf debian/hadoop/usr/lib/hadoop/libexec/jsvc*
+ rm -Rf debian/hadoop/usr/lib/hadoop/bin/jsvc
+ rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/bin/jsvc
rm -Rf debian/hadoop/usr/lib/hadoop/bin/task-controller
install-arch:
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1195586&r1=1195585&r2=1195586&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Mon Oct 31 18:08:29 2011
@@ -429,9 +429,12 @@ fi
%exclude %{lib_hadoop}/lib/native
%exclude %{lib_hadoop}/sbin/%{hadoop_arch}
%exclude %{lib_hadoop}/bin/fuse_dfs
+%exclude %{lib_hadoop}/contrib/fuse-dfs
+%exclude %{lib_hadoop}/hdfs/contrib/fuse-dfs
# FIXME: The following is a workaround for BIGTOP-139
# %exclude %{lib_hadoop}/bin/task-controller
-%exclude %{lib_hadoop}/libexec/jsvc*
+%exclude %{lib_hadoop}/bin/jsvc*
+%exclude %{lib_hadoop}/hdfs/bin/jsvc*
%files doc
%defattr(-,root,root)
@@ -496,6 +499,7 @@ fi
%files fuse
%defattr(-,root,root)
%config(noreplace) /etc/default/hadoop-fuse
+%{lib_hadoop}/contrib/fuse-dfs
%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