Author: rvs
Date: Wed Apr 25 17:45:22 2012
New Revision: 1330439
URL: http://svn.apache.org/viewvc?rev=1330439&view=rev
Log:
BIGTOP-561. HBase packaging has dangling symlinks
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build?rev=1330439&r1=1330438&r2=1330439&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
Wed Apr 25 17:45:22 2012
@@ -17,4 +17,6 @@
set -ex
mvn clean -DskipTests -Dhadoop.profile=23 -Dhadoop.version=2.0.0-SNAPSHOT
install site assembly:assembly "$@"
-tar --strip-components=2 -xzf target/hbase*.tar.gz
+rm -rf build
+mkdir build
+tar -C build --strip-components=1 -xzf target/hbase*.tar.gz
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1330439&r1=1330438&r2=1330439&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Wed Apr 25
17:45:22 2012
@@ -27,7 +27,6 @@ export DH_OPTIONS
hadoop_home=/usr/lib/hadoop
zookeeper_home=/usr/lib/zookeeper
hbase_pkg_name=hbase
-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:
@@ -43,6 +42,7 @@ clean:
build: patch
dh_testdir
bash debian/do-component-build
-Dmaven.repo.local=${HOME}/.m2/repository
+ touch $@
install: build
@@ -52,7 +52,7 @@ install: build
dh_installdirs
cp debian/hbase.default
debian/${hbase_pkg_name}/etc/default/${hbase_pkg_name}
sh -x debian/install_hbase.sh \
- --build-dir=. \
+ --build-dir=build \
--conf-dir=/etc/hbase/conf.dist \
--doc-dir=usr/share/doc/${hbase_pkg_name}-doc \
--prefix=debian/tmp
@@ -60,8 +60,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/${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/
+ rm -f debian/tmp/usr/lib/${hbase_pkg_name}/lib/{hadoop,zookeeper}*.jar
+ ln -f -s ${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
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1330439&r1=1330438&r2=1330439&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Wed
Apr 25 17:45:22 2012
@@ -26,7 +26,6 @@
%define hbase_services master regionserver thrift rest
%define hadoop_home /usr/lib/hadoop
%define zookeeper_home /usr/lib/zookeeper
-%define 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
%if %{?suse_version:1}0
@@ -242,7 +241,7 @@ env HBASE_VERSION=%{version} bash %{SOUR
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=. \
+ --build-dir=build \
--doc-dir=%{doc_hbase} \
--conf-dir=%{etc_hbase_conf_dist} \
--prefix=$RPM_BUILD_ROOT
@@ -278,8 +277,8 @@ done
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
# Pull zookeeper and hadoop from their packages
-rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{%{hbase_jar_deps_hadoop},zookeeper}*.jar
-ln -f -s %{hadoop_home}/{%{hbase_jar_deps_hadoop}}.jar
%{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hbase}
+rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{hadoop,zookeeper}*.jar
+ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hbase}
%pre
getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase
