bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1338340 - in /incubator/bigtop/trunk/bigtop-packages/src: deb/hadoop/rules deb/hbase/rules deb/hive/rules deb/mahout/rules rpm/hadoop/SPECS/hadoop.spec rpm/hbase/SPECS/hbase.spec rpm/hive/SPECS/hive.spec rpm/mahout/SPECS/mahout.spec
Date Mon, 14 May 2012 18:51:44 GMT
Author: rvs
Date: Mon May 14 18:51:43 2012
New Revision: 1338340

URL: http://svn.apache.org/viewvc?rev=1338340&view=rev
Log:
BIGTOP-583. "Class path contains multiple SLF4J bindings" warnings

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Mon May 14 18:51:43 2012
@@ -75,6 +75,8 @@ install: build
 
 	# Forcing Zookeeper dependency to be on the packaged jar
 	ln -sf /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar
+	# Workaround for BIGTOP-583
+	rm -f debian/tmp/usr/lib/hadoop-*/lib/slf4j-log4j12-*.jar
 
 # Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg Ubuntu Hardy)
 	(dh_lintian) || /bin/true

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=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Mon May 14 18:51:43 2012
@@ -60,7 +60,7 @@ 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/{hadoop,zookeeper}*.jar
+	rm -f debian/tmp/usr/lib/${hbase_pkg_name}/lib/{hadoop,zookeeper,slf4j-log4j12-}*.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/deb/hive/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Mon May 14 18:51:43 2012
@@ -54,6 +54,8 @@ install-indep: metastore server	
 	  --build-dir=src/build/dist \
 	  --doc-dir=debian/${hive_pkg_name}/usr/share/doc/${hive_pkg_name} \
 	  --python-dir=debian/python-${hive_pkg_name}/usr/share/python-support/python-${hive_pkg_name}/${hive_pkg_name}
+	# Workaround for BIGTOP-583
+	rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/slf4j-log4j12-*.jar
 	dh_pysupport
 	dh_install -i
 	ls -ld debian/${hive_pkg_name}/var/lib/${hive_pkg_name}/metastore

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Mon May 14 18:51:43 2012
@@ -49,7 +49,7 @@ install-indep:	
 	  --build-dir=build \
           --doc-dir=/usr/share/doc/mahout \
 	  --prefix=debian/mahout
-	rm -rf debian/mahout/usr/lib/mahout/lib/slf4j-*.jar debian/mahout/usr/lib/mahout/lib/hadoop
+	rm -rf debian/mahout/usr/lib/mahout/lib/slf4j-log4j12-*.jar debian/mahout/usr/lib/mahout/lib/hadoop
 	ln -fs /usr/lib/hadoop/client debian/mahout/usr/lib/mahout/lib/hadoop
 	dh_install -i
 	(dh_lintian) || /bin/true

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Mon May 14 18:51:43
2012
@@ -452,6 +452,8 @@ bash %{SOURCE2} \
 
 # Forcing Zookeeper dependency to be on the packaged jar
 %__ln_s -f /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hadoop}/lib/zookeeper*.jar
+# Workaround for BIGTOP-583
+%__rm -f $RPM_BUILD_ROOT/%{lib_hadoop}-*/lib/slf4j-log4j12-*.jar
 
 # Init.d scripts
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/

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=1338340&r1=1338339&r2=1338340&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 Mon May 14 18:51:43
2012
@@ -277,7 +277,7 @@ done
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
 # Pull zookeeper and hadoop from their packages
-rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{hadoop,zookeeper}*.jar
+rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{hadoop,zookeeper,slf4j-log4j12-}*.jar
 ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hbase}
 
 %pre

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Mon May 14 18:51:43
2012
@@ -142,6 +142,9 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name}
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}
 
+# Workaround for BIGTOP-583
+%__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/slf4j-log4j12-*.jar
+
 for service in %{hive_services}
 do
         init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1338340&r1=1338339&r2=1338340&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Mon May 14 18:51:43
2012
@@ -77,7 +77,7 @@ sh $RPM_SOURCE_DIR/install_mahout.sh \
           --build-dir=build \
           --prefix=$RPM_BUILD_ROOT \
           --doc-dir=%{doc_mahout} 
-rm -rf $RPM_BUILD_ROOT/usr/lib/mahout/lib/slf4j-*.jar $RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop
+rm -rf $RPM_BUILD_ROOT/usr/lib/mahout/lib/slf4j-log4j12-*.jar $RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop
 ln -fs /usr/lib/hadoop/client $RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop
 
 %post



Mime
View raw message