BIGTOP-363. Bump version of sqoop to sqoop-1.4.1

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1292928 13f79535-47bb-0310-9956-ffa450edef68

bigtop-packages/src/common/sqoop/do-component-build

@@ -16,6 +16,6 @@
 
 set -ex
 
-ant -f build.xml package "$@"
+ant -f build.xml -Dhadoopversion=100 package "$@"
 
 

bigtop-packages/src/common/sqoop/install_sqoop.sh

@@ -108,30 +108,30 @@ CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
 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
 
 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`

bigtop-packages/src/deb/sqoop/rules

@@ -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

bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec

@@ -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. This optional package hosts a metadata
 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

bigtop.mk

@@ -75,17 +75,17 @@ HIVE_SITE=$(APACHE_MIRROR)/hive/hive-$(HIVE_BASE_VERSION)/
 $(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