Repository: bigtop Updated Branches: refs/heads/master dddbca06b -> 45ea264d0
BIGTOP-2419. Fix symlinks on packaging Crunch rpm and deb Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/45ea264d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/45ea264d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/45ea264d Branch: refs/heads/master Commit: 45ea264d037569e48929a9b88a5f872da9405036 Parents: dddbca0 Author: Youngwoo Kim <[email protected]> Authored: Tue May 3 11:02:12 2016 +0900 Committer: Youngwoo Kim <[email protected]> Committed: Tue May 3 11:02:12 2016 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/crunch/install_crunch.sh | 2 +- bigtop-packages/src/deb/crunch/control | 1 + bigtop-packages/src/deb/crunch/rules | 10 +++++++++- bigtop-packages/src/rpm/crunch/SPECS/crunch.spec | 11 ++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/45ea264d/bigtop-packages/src/common/crunch/install_crunch.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/crunch/install_crunch.sh b/bigtop-packages/src/common/crunch/install_crunch.sh index 546191f..88c83fb 100644 --- a/bigtop-packages/src/common/crunch/install_crunch.sh +++ b/bigtop-packages/src/common/crunch/install_crunch.sh @@ -99,4 +99,4 @@ mv $PREFIX/$LIB_DIR/crunch-test-*.jar $PREFIX/$DOC_DIR rm -f $PREFIX/$LIB_DIR/lib/zookeeper-*.jar rm -f $PREFIX/$LIB_DIR/lib/hadoop-*.jar - +rm -f $PREFIX/$LIB_DIR/lib/hbase-*.jar http://git-wip-us.apache.org/repos/asf/bigtop/blob/45ea264d/bigtop-packages/src/deb/crunch/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/crunch/control b/bigtop-packages/src/deb/crunch/control index 3c38e84..55d24b4 100644 --- a/bigtop-packages/src/deb/crunch/control +++ b/bigtop-packages/src/deb/crunch/control @@ -23,6 +23,7 @@ Homepage: http://crunch.apache.org/ Package: crunch Architecture: all +Depends: hadoop-client, bigtop-utils (>= 0.7), hbase Description: Simple and Efficient MapReduce Pipelines. Apache Crunch is a Java library for writing, testing, and running MapReduce pipelines, based on Google's FlumeJava. Its goal is to make http://git-wip-us.apache.org/repos/asf/bigtop/blob/45ea264d/bigtop-packages/src/deb/crunch/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/crunch/rules b/bigtop-packages/src/deb/crunch/rules index aed4d77..a56c947 100644 --- a/bigtop-packages/src/deb/crunch/rules +++ b/bigtop-packages/src/deb/crunch/rules @@ -26,7 +26,7 @@ export DH_OPTIONS lib_crunch=/usr/lib/crunch zookeeper_home=/usr/lib/zookeeper hadoop_home=/usr/lib/hadoop - +hbase_home=/usr/lib/hbase %: dh $@ @@ -52,3 +52,11 @@ override_dh_auto_install: ln -fs ${hadoop_home}/client/hadoop-mapreduce-client-core.jar debian/tmp/${lib_crunch}/lib/ ln -fs ${hadoop_home}/client/hadoop-yarn-api.jar debian/tmp/${lib_crunch}/lib/ ln -fs ${hadoop_home}/client/hadoop-yarn-common.jar debian/tmp/${lib_crunch}/lib/ + + ln -fs ${hbase_home}/hbase-annotations.jar debian/tmp/${lib_crunch}/lib/ + ln -fs ${hbase_home}/hbase-common-tests.jar debian/tmp/${lib_crunch}/lib/ + ln -fs ${hbase_home}/hbase-hadoop-compat.jar debian/tmp/${lib_crunch}/lib/ + ln -fs ${hbase_home}/hbase-hadoop2-compat.jar debian/tmp/${lib_crunch}/lib/ + ln -fs ${hbase_home}/hbase-prefix-tree.jar debian/tmp/${lib_crunch}/lib/ + ln -fs ${hbase_home}/hbase-procedure.jar debian/tmp/${lib_crunch}/lib/ + ln -fs 4{hbase_home}/hbase-server.jar debian/tmp/${lib_crunch}/lib/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/45ea264d/bigtop-packages/src/rpm/crunch/SPECS/crunch.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/crunch/SPECS/crunch.spec b/bigtop-packages/src/rpm/crunch/SPECS/crunch.spec index fd958f5..c8e0975 100644 --- a/bigtop-packages/src/rpm/crunch/SPECS/crunch.spec +++ b/bigtop-packages/src/rpm/crunch/SPECS/crunch.spec @@ -18,6 +18,7 @@ %define crunch_folder apache-%{crunch_name}-%{crunch_base_version}-src %define zookeeper_home /usr/lib/zookeeper %define hadoop_home /usr/lib/hadoop +%define hbase_home /usr/lib/hbase %if %{?suse_version:1}0 %define doc_crunch %{_docdir}/crunch-doc @@ -41,7 +42,7 @@ Source0: %{crunch_folder}.tar.gz Source1: do-component-build Source2: install_%{crunch_name}.sh Source3: bigtop.bom -Requires: hadoop-client, bigtop-utils >= 0.7 +Requires: hadoop-client, bigtop-utils >= 0.7, hbase %description Apache Crunch is a Java library for writing, testing, and running @@ -77,6 +78,14 @@ ln -fs %{hadoop_home}/client/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{ ln -fs %{hadoop_home}/client/hadoop-yarn-api.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ ln -fs %{hadoop_home}/client/hadoop-yarn-common.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-annotations.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-common-tests.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-hadoop-compat.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-hadoop2-compat.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-prefix-tree.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-procedure.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ +ln -fs %{hbase_home}/hbase-server.jar $RPM_BUILD_ROOT/%{lib_crunch}/lib/ + ####################### #### FILES SECTION #### #######################
