Author: bmahe
Date: Fri Nov 4 23:00:05 2011
New Revision: 1197811
URL: http://svn.apache.org/viewvc?rev=1197811&view=rev
Log:
Update hadoop 23 branch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1197811&r1=1197810&r2=1197811&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Fri Nov 4 23:00:05 2011
@@ -135,6 +135,8 @@ HADOOP_BIN_DIR=${HADOOP_DIR}/bin
HADOOP_SBIN_DIR=${HADOOP_DIR}/sbin
HADOOP_LIB_DIR=${HADOOP_DIR}/lib
+HADOOP_VERSION=0.23.0-SNAPSHOT
+
# Make bin wrappers
mkdir -p $BIN_DIR
@@ -164,6 +166,7 @@ cp ${BUILD_DIR}/lib/*.jar ${HADOOP_LIB_D
# hadoop jar
install -d -m 0755 ${HADOOP_DIR}
cp ${BUILD_DIR}/modules/*.jar ${HADOOP_DIR}/
+chmod 644 ${HADOOP_DIR}/*.jar
# native libs
install -d -m 0755 ${SYSTEM_LIB_DIR}
@@ -191,11 +194,17 @@ cp ${BUILD_DIR}/etc/hadoop/* $YARN_ETC_D
install -d -m 0755 ${DOC_DIR}
cp -r ${BUILD_DIR}/../target/site/* ${DOC_DIR}/
-# source
-cp -r ${BUILD_DIR}/src ${DOC_DIR}/
+# source jars
+cp
${BUILD_DIR}/../hadoop-common-project/hadoop-auth/target/hadoop-auth-${HADOOP_VERSION}-sources.jar
${HADOOP_DIR}/
+cp
${BUILD_DIR}/../hadoop-common-project/hadoop-common/target/hadoop-common-${HADOOP_VERSION}-test-sources.jar
${HADOOP_DIR}/
+cp
${BUILD_DIR}/../hadoop-common-project/hadoop-common/target/hadoop-common-${HADOOP_VERSION}-sources.jar
${HADOOP_DIR}/
+cp
${BUILD_DIR}/../hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${HADOOP_VERSION}-sources.jar
${HADOOP_DIR}/
+cp
${BUILD_DIR}/../hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${HADOOP_VERSION}-test-sources.jar
${HADOOP_DIR}/
+chmod 644 ${HADOOP_DIR}/*.jar
# man pages
mkdir -p $MAN_DIR/man1
gzip -c < $DISTRO_DIR/hadoop.1 > $MAN_DIR/man1/hadoop.1.gz
+chmod 644 $MAN_DIR/man1/hadoop.1.gz
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1197811&r1=1197810&r2=1197811&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Fri Nov 4 23:00:05 2011
@@ -48,6 +48,7 @@
# CentOS 5 does not have any dist macro
# So I will suppose anything that is not Mageia or a SUSE will be a
RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
+
# brp-repack-jars uses unzip to expand jar files
# Unfortunately aspectjtools-1.6.5.jar pulled by ivy contains some files and
directories without any read permission
# and make whole process to fail.
@@ -60,6 +61,8 @@
/usr/lib/rpm/brp-python-bytecompile ; \
%{nil}
+
+%define libexecdir %{_libexecdir}
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd alternatives
%global initd_dir %{_sysconfdir}/rc.d/init.d
@@ -79,12 +82,14 @@
/usr/lib/rpm/brp-compress ; \
%{nil}
+%define libexecdir %{_libexecdir}
%define doc_hadoop %{_docdir}/%{name}
%define alternatives_cmd update-alternatives
%global initd_dir %{_sysconfdir}/rc.d
%endif
%if 0%{?mgaversion}
+%define libexecdir /usr/libexec/
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd update-alternatives
%global initd_dir %{_sysconfdir}/rc.d/init.d
@@ -260,7 +265,7 @@ DataNodes to bind to a low (privileged)
before continuing operation.
%prep
-%setup -n apache-hadoop-common-562cef1
+%setup -n apache-hadoop-common-c6c6fb0
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME
@@ -285,7 +290,7 @@ bash %{SOURCE2} \
--build-dir=$PWD/build \
--system-include-dir=$RPM_BUILD_ROOT%{_includedir} \
--system-lib-dir=$RPM_BUILD_ROOT%{_libdir} \
- --system-libexec-dir=$RPM_BUILD_ROOT%{_libexecdir} \
+ --system-libexec-dir=$RPM_BUILD_ROOT%{libexecdir} \
--hadoop-etc-dir=$RPM_BUILD_ROOT%{etc_hadoop} \
--yarn-etc-dir=$RPM_BUILD_ROOT%{etc_yarn} \
--prefix=$RPM_BUILD_ROOT \
@@ -334,7 +339,7 @@ done
%__install -m 0644 %{SOURCE9}
$RPM_BUILD_ROOT/etc/security/limits.d/hadoop.nofiles.conf
# /var/lib/hadoop/cache
-%__install -d -m 1777 $RPM_BUILD_ROOT/var/lib/%{name}/cache
+%__install -d -m 1777 $RPM_BUILD_ROOT/var/lib/%{name}/cache/hadoop
# /var/log/hadoop
%__install -d -m 0755 $RPM_BUILD_ROOT/var/log
%__install -d -m 0775 $RPM_BUILD_ROOT/var/run/%{name}
@@ -380,15 +385,20 @@ fi
%files
%defattr(-,root,root)
%config(noreplace) %{etc_hadoop}/conf.empty
+%config(noreplace) %{etc_yarn}/conf.empty
%config(noreplace) /etc/default/hadoop
%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
%{lib_hadoop}
%{_libdir}/libhadoop*
+%{libexecdir}/hadoop-config.sh
+%{libexecdir}/hdfs-config.sh
%{bin_hadoop}/%{name}
%attr(0775,root,hadoop) /var/run/%{name}
%attr(0775,root,hadoop) %{log_hadoop}
%{man_hadoop}/man1/hadoop.1.*
+%exclude %{lib_hadoop}/sbin
+
%files doc
%defattr(-,root,root)
%doc %{doc_hadoop}
@@ -413,11 +423,6 @@ if [ $1 -ge 1 ]; then \
service %{name}-%1 condrestart >/dev/null 2>&1 \
fi
-%define post_namenode \
-if [ ! -d /var/lib/%{name}/cache/hadoop/dfs/name ]; then \
- HADOOP_NAMENODE_USER=hdfs hadoop namenode -format 2>/dev/null 1>/dev/null
|| : \
-fi
-
%service_macro namenode post_namenode
%service_macro secondarynamenode
%service_macro datanode
@@ -443,10 +448,11 @@ fi
%files libhdfs
%defattr(-,root,root)
%{_libdir}/libhdfs*
-#%{_includedir}/hdfs.h
+%{_includedir}/hdfs.h
# -devel should be its own package
#%doc %{_docdir}/libhdfs-%{hadoop_version}
%files sbin
%defattr(-,root,root)
%dir %{lib_hadoop}/sbin
+%{lib_hadoop}/sbin/*
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1197811&r1=1197810&r2=1197811&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Fri Nov 4 23:00:05 2011
@@ -24,7 +24,7 @@ HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=562cef1
+HADOOP_TARBALL_SRC=c6c6fb0
HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
$(eval $(call PACKAGE,hadoop,HADOOP))
