Merge branch 'hadoop-0.23' into trunk

Conflicts:
	CHANGES.txt
	bigtop-deploy/live-cd/apache-bigtop.ks
	bigtop-deploy/puppet/manifests/cluster.pp
	bigtop-deploy/puppet/manifests/site.pp
	bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb
	bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
	bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
	bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
	bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
	bigtop-packages/src/common/flume/do-component-build
	bigtop-packages/src/common/flume/flume-node.init
	bigtop-packages/src/common/hadoop/do-component-build
	bigtop-packages/src/common/hadoop/hdfs.conf
	bigtop-packages/src/common/hadoop/install_hadoop.sh
	bigtop-packages/src/common/hadoop/service-hadoop-httpfs
	bigtop-packages/src/common/hbase/install_hbase.sh
	bigtop-packages/src/common/hive/hadoop-hive.sh
	bigtop-packages/src/common/hive/hive.sh
	bigtop-packages/src/common/hive/hive.sh.suse
	bigtop-packages/src/common/hive/install_hive.sh
	bigtop-packages/src/common/oozie/do-component-build
	bigtop-packages/src/common/oozie/install_oozie.sh
	bigtop-packages/src/common/sqoop/do-component-build
	bigtop-packages/src/common/sqoop/install_sqoop.sh
	bigtop-packages/src/common/zookeeper/zookeeper.1
	bigtop-packages/src/deb/flume/control
	bigtop-packages/src/deb/flume/rules
	bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
	bigtop-packages/src/deb/hadoop/hadoop.install
	bigtop-packages/src/deb/hadoop/hadoop.postinst
	bigtop-packages/src/deb/hadoop/rules
	bigtop-packages/src/deb/hbase/control
	bigtop-packages/src/deb/hbase/rules
	bigtop-packages/src/deb/hive/rules
	bigtop-packages/src/deb/oozie/rules
	bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
	bigtop-packages/src/rpm/flume/SPECS/flume.spec
	bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
	bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
	bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
	bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
	bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0-dev.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-node.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-debuginfo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-libhdfs.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-master.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-regionserver.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-thrift.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hive.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop-metastore.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/whirr.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper-server.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-node.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-libhdfs.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-master.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-regionserver.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-thrift.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop-metastore.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/whirr.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper-server.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper.xml
	bigtop-tests/test-execution/smokes/pom.xml
	bigtop.mk

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1326670 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 6 deletions

diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control
index a2f12937..1210ee9c 100644
--- a/bigtop-packages/src/deb/hbase/control
+++ b/bigtop-packages/src/deb/hbase/control
@@ -22,7 +22,7 @@ Homepage: http://hbase.apache.org/
 
 Package: hbase
 Architecture: all
-Depends: adduser, zookeeper (>= 3.3.1), hadoop, bigtop-utils
+Depends: adduser, zookeeper (>= 3.3.1), hadoop-hdfs, bigtop-utils
 Recommends: ntp
 Description: HBase is the Hadoop database
  Use it when you need random, realtime read/write access to your Big Data. 
diff --git a/bigtop-packages/src/deb/hbase/rules b/bigtop-packages/src/deb/hbase/rules
index 403bbc3e..a54f9341 100755
--- a/bigtop-packages/src/deb/hbase/rules
+++ b/bigtop-packages/src/deb/hbase/rules
@@ -16,6 +16,7 @@
 # limitations under the License.
 # 
 # -*- makefile -*-
+SHELL=/bin/bash
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -26,10 +27,11 @@ export DH_OPTIONS
 hadoop_home=/usr/lib/hadoop
 zookeeper_home=/usr/lib/zookeeper
 hbase_pkg_name=hbase
-hbase_jar_deps=${hadoop_home}/hadoop-core.jar ${zookeeper_home}/zookeeper.jar
+hbase_jar_deps_hadoop=hadoop-annotations,hadoop-auth,hadoop-common,hadoop-hdfs,hadoop-mapreduce-client-common,hadoop-mapreduce-client-core,hadoop-yarn-api,hadoop-yarn-common
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p0 < debian/HBASE-5212.patch
 	touch $@
 
 clean:	
@@ -39,7 +41,7 @@ clean:
 	dh_clean
 	find debian -name .\*swp -exec rm -f {} \;
 
-build:
+build: patch
 	dh_testdir
 	bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository  
 
@@ -59,9 +61,8 @@ install: build
 	cp debian/hbase.nofiles.conf debian/tmp/etc/security/limits.d/${hbase_pkg_name}.nofiles.conf
 	# Symlink in the dependency jars from their packages. Both of these packages
 	# provide an unversioned symlink foo.jar -> foo-0.1.2.jar.
-	rm -f debian/tmp/usr/lib/hadoop-*
-	rm -f debian/tmp/usr/lib/zookeeper-*
-	ln -f -s ${hbase_jar_deps} debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+	rm -f debian/tmp/usr/lib/${hbase_pkg_name}/lib/{${hbase_jar_deps_hadoop},zookeeper}*.jar
+	ln -f -s ${hadoop_home}/{${hbase_jar_deps_hadoop}}.jar ${zookeeper_home}/zookeeper.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/
 	ln -s /var/log/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/logs
 	ln -s /var/run/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/pids