You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2017/08/05 02:39:53 UTC
bigtop git commit: BIGTOP-2864: Multiple SLF4J bindings in tez
Repository: bigtop
Updated Branches:
refs/heads/master 5ff983d46 -> 7d574a512
BIGTOP-2864: Multiple SLF4J bindings in tez
Closes #272
Signed-off-by: Konstantin Boudnik <co...@boudnik.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7d574a51
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7d574a51
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7d574a51
Branch: refs/heads/master
Commit: 7d574a512d3334f1ba20203f6727dbd8d02092fe
Parents: 5ff983d
Author: dengkai02 <de...@baidu.com>
Authored: Fri Aug 4 14:20:13 2017 +0800
Committer: Konstantin Boudnik <co...@boudnik.org>
Committed: Fri Aug 4 19:39:00 2017 -0700
----------------------------------------------------------------------
bigtop-packages/src/deb/tez/rules | 1 +
bigtop-packages/src/rpm/tez/SPECS/tez.spec | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7d574a51/bigtop-packages/src/deb/tez/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/tez/rules b/bigtop-packages/src/deb/tez/rules
index a330120..8179182 100644
--- a/bigtop-packages/src/deb/tez/rules
+++ b/bigtop-packages/src/deb/tez/rules
@@ -42,6 +42,7 @@ override_dh_auto_install:
--build-dir=. \
--doc-dir=usr/share/doc/${tez_pkg_name}-doc \
--prefix=debian/tmp
+ rm -f debian/tmp/usr/lib/${tez_pkg_name}/lib/slf4j-log4j12-*.jar
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
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7d574a51/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 b7697c3..2605e50 100644
--- a/bigtop-packages/src/rpm/tez/SPECS/tez.spec
+++ b/bigtop-packages/src/rpm/tez/SPECS/tez.spec
@@ -93,6 +93,7 @@ sh %{SOURCE2} \
--libexec-dir=%{libexec_tez} \
--prefix=$RPM_BUILD_ROOT
+%__rm -f $RPM_BUILD_ROOT/%{lib_tez}/slf4j-log4j12-*.jar
%__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