You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2016/08/22 06:56:12 UTC

bigtop git commit: BIGTOP-2500. Remove hadoop jars from TEZ_HOME/lib and create appropriate symlinks

Repository: bigtop
Updated Branches:
  refs/heads/master 47d1f6970 -> 19c442c66


BIGTOP-2500. Remove hadoop jars from TEZ_HOME/lib and create appropriate symlinks


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/19c442c6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/19c442c6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/19c442c6

Branch: refs/heads/master
Commit: 19c442c666f5c179d1b4ab17af7074eeaa1b887d
Parents: 47d1f69
Author: Youngwoo Kim <yw...@apache.org>
Authored: Tue Jul 19 10:25:47 2016 +0900
Committer: Youngwoo Kim <yw...@apache.org>
Committed: Mon Aug 22 15:59:35 2016 +0900

----------------------------------------------------------------------
 bigtop-packages/src/deb/tez/rules          | 7 +++++++
 bigtop-packages/src/rpm/tez/SPECS/tez.spec | 6 ++++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/19c442c6/bigtop-packages/src/deb/tez/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/tez/rules b/bigtop-packages/src/deb/tez/rules
index 467de0a..a330120 100644
--- a/bigtop-packages/src/deb/tez/rules
+++ b/bigtop-packages/src/deb/tez/rules
@@ -25,6 +25,8 @@ export DH_VERBOSE=1
 export DH_OPTIONS
 
 tez_pkg_name=tez
+tez_home=/usr/lib/tez
+lib_tez=/usr/lib/tez/lib
 
 %:
 	dh $@
@@ -40,3 +42,8 @@ override_dh_auto_install:
 		--build-dir=. \
 		--doc-dir=usr/share/doc/${tez_pkg_name}-doc \
 		--prefix=debian/tmp
+	ln -sf /usr/lib/hadoop/hadoop-annotations.jar debian/tmp/${lib_tez}/hadoop-annotations.jar
+	ln -sf /usr/lib/hadoop/hadoop-auth.jar debian/tmp/${lib_tez}/hadoop-auth.jar
+	ln -sf /usr/lib/hadoop-mapreduce/hadoop-mapreduce-client-common.jar debian/tmp/${lib_tez}/hadoop-mapreduce-client-common.jar
+	ln -sf /usr/lib/hadoop-mapreduce/hadoop-mapreduce-client-core.jar debian/tmp/${lib_tez}/hhadoop-mapreduce-client-core.jar
+	ln -sf /usr/lib/hadoop-yarn/hadoop-yarn-server-web-proxy.jar debian/tmp/${lib_tez}/hadoop-yarn-server-web-proxy.jar

http://git-wip-us.apache.org/repos/asf/bigtop/blob/19c442c6/bigtop-packages/src/rpm/tez/SPECS/tez.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/tez/SPECS/tez.spec b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
index bf74337..b7697c3 100644
--- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec
+++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
@@ -93,6 +93,12 @@ sh %{SOURCE2} \
         --libexec-dir=%{libexec_tez} \
 	--prefix=$RPM_BUILD_ROOT
 
+%__ln_s -f /usr/lib/hadoop/hadoop-annotations.jar $RPM_BUILD_ROOT/%{lib_tez}/hadoop-annotations.jar
+%__ln_s -f /usr/lib/hadoop/hadoop-auth.jar $RPM_BUILD_ROOT/%{lib_tez}/hadoop-auth.jar
+%__ln_s -f /usr/lib/hadoop-mapreduce/hadoop-mapreduce-client-common.jar $RPM_BUILD_ROOT/%{lib_tez}/hadoop-mapreduce-client-common.jar
+%__ln_s -f /usr/lib/hadoop-mapreduce/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_tez}/hhadoop-mapreduce-client-core.jar
+%__ln_s -f /usr/lib/hadoop-yarn/hadoop-yarn-server-web-proxy.jar $RPM_BUILD_ROOT/%{lib_tez}/hadoop-yarn-server-web-proxy.jar
+
 %pre
 
 %post