You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2011/10/26 04:06:38 UTC
svn commit: r1188996 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/hadoop/ deb/hadoop/ rpm/hadoop/SOURCES/ rpm/hadoop/SPECS/
Author: bmahe
Date: Wed Oct 26 02:06:38 2011
New Revision: 1188996
URL: http://svn.apache.org/viewvc?rev=1188996&view=rev
Log:
BIGTOP-167. All of Hadoop wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1188996&r1=1188995&r2=1188996&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh Wed Oct 26 02:06:38 2011
@@ -138,6 +138,13 @@ for bin_wrapper in hadoop ; do
cat > $wrapper <<EOF
#!/bin/sh
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
export HADOOP_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$bin_wrapper "\$@"
EOF
@@ -226,6 +233,13 @@ if [ ! -z "$NATIVE_BUILD_STRING" ]; then
/sbin/modprobe fuse
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
export HADOOP_HOME=$INSTALLED_LIB_DIR
if [ -f /etc/default/hadoop-fuse ]
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control?rev=1188996&r1=1188995&r2=1188996&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Wed Oct 26 02:06:38 2011
@@ -24,7 +24,7 @@ Homepage: http://hadoop.apache.org/core/
Package: hadoop
Provides: hadoop
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils
Recommends: hadoop-native
Description: A software platform for processing vast amounts of data
Hadoop is a software platform that lets one easily write and
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl?rev=1188996&r1=1188995&r2=1188996&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl Wed Oct 26 02:06:38 2011
@@ -48,6 +48,13 @@ install -d -m 0775 -o root -g hadoop /va
. /etc/default/hadoop
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
. $HADOOP_HOME/bin/hadoop-config.sh
# FIXME: this needs to be removed once hadoop-config.sh stop clobbering HADOOP_HOME
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl?rev=1188996&r1=1188995&r2=1188996&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl Wed Oct 26 02:06:38 2011
@@ -23,6 +23,13 @@
source /etc/rc.d/init.d/functions
source /etc/default/hadoop
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh
# FIXME: this needs to be removed once hadoop-config.sh stop clobbering HADOOP_HOME
source /etc/default/hadoop
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse?rev=1188996&r1=1188995&r2=1188996&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse Wed Oct 26 02:06:38 2011
@@ -34,6 +34,13 @@
source /lib/lsb/init-functions
source /etc/default/hadoop
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh
# FIXME: this needs to be removed once hadoop-config.sh stop clobbering HADOOP_HOME
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=1188996&r1=1188995&r2=1188996&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 Wed Oct 26 02:06:38 2011
@@ -118,7 +118,7 @@ Source8: hadoop-fuse.default
Source9: hadoop.nofiles.conf
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
-Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service
+Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils
Provides: hadoop
%if %{?suse_version:1}0