Author: rvs
Date: Thu Feb 23 20:02:02 2012
New Revision: 1292931
URL: http://svn.apache.org/viewvc?rev=1292931&view=rev
Log:
BIGTOP-363. Bump version of sqoop to sqoop-1.4.1
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build?rev=1292931&r1=1292930&r2=1292931&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
Thu Feb 23 20:02:02 2012
@@ -17,5 +17,3 @@
set -ex
ant -f build.xml -Dhadoopversion=23 package "$@"
-
-
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1292931&r1=1292930&r2=1292931&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
Thu Feb 23 20:02:02 2012
@@ -108,10 +108,10 @@ CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dis
install -d -m 0755 ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/sqoop*.jar ${PREFIX}/${LIB_DIR}
+cp $BUILD_DIR/sqoop*.jar ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-cp -a ${BUILD_DIR}/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
+cp -a $BUILD_DIR/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
#install -d -m 0755 ${PREFIX}/${LIB_DIR}/shims
#cp -a shims/*.jar ${PREFIX}/${LIB_DIR}/shims
@@ -119,13 +119,13 @@ cp -a ${BUILD_DIR}/lib/*.jar ${PREFIX}/$
install -d -m 0755 $PREFIX/usr/bin
install -d -m 0755 $PREFIX/${BIN_DIR}
-cp ${BUILD_DIR}/bin/* $PREFIX/${BIN_DIR}
+cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR}
install -d -m 0755 $PREFIX/${DOC_DIR}
-cp ${BUILD_DIR}/docs/*.html $PREFIX/${DOC_DIR}
-cp ${BUILD_DIR}/docs/*.css $PREFIX/${DOC_DIR}
-cp -r ${BUILD_DIR}/docs/api $PREFIX/${DOC_DIR}
-cp -r ${BUILD_DIR}/docs/images $PREFIX/${DOC_DIR}
+cp $BUILD_DIR/docs/*.html $PREFIX/${DOC_DIR}
+cp $BUILD_DIR/docs/*.css $PREFIX/${DOC_DIR}
+cp -r $BUILD_DIR/docs/api $PREFIX/${DOC_DIR}
+cp -r $BUILD_DIR/docs/images $PREFIX/${DOC_DIR}
install -d -m 0755 $PREFIX/$MAN_DIR
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1292931&r1=1292930&r2=1292931&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
Thu Feb 23 20:02:02 2012
@@ -101,7 +101,7 @@ server for Sqoop clients across a networ
%setup -n %{name}-%{sqoop_base_version}-src
%build
-bash %{SOURCE1}
+bash %{SOURCE1} -Dversion=%{sqoop_base_version}
%install
%__rm -rf $RPM_BUILD_ROOT
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1292931&r1=1292930&r2=1292931&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Thu Feb 23 20:02:02 2012
@@ -84,8 +84,7 @@ SQOOP_PKG_VERSION=1.4.1
SQOOP_RELEASE_VERSION=1
SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
SQOOP_TARBALL_SRC=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)-src.tar.gz
-#SQOOP_SITE=$(APACHE_MIRROR)/incubator/$(SQOOP_NAME)/$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)/
-SQOOP_SITE=http://people.apache.org/~jarcec/sqoop-1.4.1-incubating-rc3/
+SQOOP_SITE=$(APACHE_MIRROR)/incubator/$(SQOOP_NAME)/$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)/
$(eval $(call PACKAGE,sqoop,SQOOP))
# Oozie
