Author: rvs
Date: Thu Feb 23 19:56:04 2012
New Revision: 1292928
URL: http://svn.apache.org/viewvc?rev=1292928&view=rev
Log:
BIGTOP-363. Bump version of sqoop to sqoop-1.4.1
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/trunk/bigtop.mk
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build?rev=1292928&r1=1292927&r2=1292928&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
Thu Feb 23 19:56:04 2012
@@ -16,6 +16,6 @@
set -ex
-ant -f build.xml package "$@"
+ant -f build.xml -Dhadoopversion=100 package "$@"
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1292928&r1=1292927&r2=1292928&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
Thu Feb 23 19:56:04 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 sqoop*.jar ${PREFIX}/${LIB_DIR}
+cp $BUILD_DIR/sqoop*.jar ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-cp -a 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,19 +119,19 @@ cp -a lib/*.jar ${PREFIX}/${LIB_DIR}/lib
install -d -m 0755 $PREFIX/usr/bin
install -d -m 0755 $PREFIX/${BIN_DIR}
-cp bin/* $PREFIX/${BIN_DIR}
+cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR}
install -d -m 0755 $PREFIX/${DOC_DIR}
-cp docs/*.html $PREFIX/${DOC_DIR}
-cp docs/*.css $PREFIX/${DOC_DIR}
-cp -r docs/api $PREFIX/${DOC_DIR}
-cp -r 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
for i in sqoop sqoop-codegen sqoop-export sqoop-import-all-tables
sqoop-version sqoop-create-hive-table sqoop-help sqoop-list-databases
sqoop-eval sqoop-import sqoop-list-tables sqoop-job sqoop-metastore sqoop-merge
do echo "Copying manpage $i"
- cp docs/man/$i* $PREFIX/$MAN_DIR
+ cp $BUILD_DIR/docs/man/$i* $PREFIX/$MAN_DIR
echo "Creating wrapper for $i"
wrapper=$PREFIX/usr/bin/$i
mkdir -p `dirname $wrapper`
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules?rev=1292928&r1=1292927&r2=1292928&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules Thu Feb 23
19:56:04 2012
@@ -45,7 +45,7 @@ install-indep:
dh_testdir
dh_testroot
sh -x debian/install_sqoop.sh \
- --build-dir=. \
+ --build-dir=build/sqoop-${SQOOP_BASE_VERSION} \
--conf-dir=/etc/sqoop/conf.dist \
--prefix=debian/sqoop
dh_install -i
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1292928&r1=1292927&r2=1292928&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Thu
Feb 23 19:56:04 2012
@@ -19,6 +19,21 @@
%if %{?suse_version:1}0
+# Only tested on openSUSE 11.4. le'ts update it for previous release when
confirmed
+%if 0%{suse_version} > 1130
+%define suse_check \# Define an empty suse_check for compatibility with older
sles
+%endif
+
+# SLES is more strict anc check all symlinks point to valid path
+# But we do point to a hadoop jar which is not there at build time
+# (but would be at install time).
+# Since our package build system does not handle dependencies,
+# these symlink checks are deactivated
+%define __os_install_post \
+ %{suse_check} ; \
+ /usr/lib/rpm/brp-compress ; \
+ %{nil}
+
%define doc_sqoop %{_docdir}/sqoop
%global initd_dir %{_sysconfdir}/rc.d
%define alternatives_cmd update-alternatives
@@ -83,15 +98,15 @@ Shared metadata repository for Sqoop. Th
server for Sqoop clients across a network to use.
%prep
-%setup -n sqoop-%{sqoop_base_version}
+%setup -n %{name}-%{sqoop_base_version}-src
%build
-bash %{SOURCE1} -Dversion=%{version}
+bash %{SOURCE1} -Dversion=%{sqoop_base_version}
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=. \
+ --build-dir=build/sqoop-%{sqoop_base_version} \
--conf-dir=%{conf_sqoop_dist} \
--doc-dir=%{doc_sqoop} \
--prefix=$RPM_BUILD_ROOT
Modified: incubator/bigtop/trunk/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1292928&r1=1292927&r2=1292928&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Thu Feb 23 19:56:04 2012
@@ -75,17 +75,17 @@ HIVE_SITE=$(APACHE_MIRROR)/hive/hive-$(H
$(eval $(call PACKAGE,hive,HIVE))
# Sqoop
-# FIXME: disabled because of BIGTOP-203
-# SQOOP_NAME=sqoop
-# SQOOP_RELNOTES_NAME=Sqoop
-# SQOOP_PKG_NAME=sqoop
-# SQOOP_BASE_VERSION=1.3.0
-# SQOOP_PKG_VERSION=1.3.0
-# SQOOP_RELEASE_VERSION=1
-# SQOOP_TARBALL_DST=sqoop-$(SQOOP_BASE_VERSION).tar.gz
-# SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)
-# SQOOP_SITE=http://github.com/downloads/cloudera/sqoop/
-# $(eval $(call PACKAGE,sqoop,SQOOP))
+SQOOP_NAME=sqoop
+SQOOP_RELNOTES_NAME=Sqoop
+SQOOP_PKG_NAME=sqoop
+SQOOP_BASE_VERSION=1.4.1-incubating
+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)/
+$(eval $(call PACKAGE,sqoop,SQOOP))
+
# Oozie
OOZIE_NAME=oozie
