aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Shaposhnik <rvs@apache.org>2012-11-08 12:01:49 -0800
committerRoman Shaposhnik <rvs@apache.org>2012-11-08 12:01:49 -0800
commit3fd101c1070ce7a8872e197e72ad2d06843bc1a8 (patch)
tree1cd6d823fb0dfa7eec549c2510ed7f751e2935b7
parentf24ecb43a76eb5b9afdd48c61715968192b939dc (diff)
BIGTOP-752: Bump Sqoop to 1.4.2
-rw-r--r--bigtop-packages/src/common/sqoop/do-component-build2
-rwxr-xr-xbigtop-packages/src/deb/sqoop/rules2
-rw-r--r--bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec2
3 files changed, 3 insertions, 3 deletions
diff --git a/bigtop-packages/src/common/sqoop/do-component-build b/bigtop-packages/src/common/sqoop/do-component-build
index b1e460d3..42a24423 100644
--- a/bigtop-packages/src/common/sqoop/do-component-build
+++ b/bigtop-packages/src/common/sqoop/do-component-build
@@ -16,4 +16,4 @@
set -ex
. `dirname ${0}`/bigtop.bom
-ant -f build.xml -Dhadoopversion=200 -Dhadoop.version.full=$HADOOP_BASE_VERSION -Dhadoop.version=$HADOOP_VERSION -Dhbase.version=$HBASE_VERSION -Dzookeeper.version=$ZOOKEEPER_VERSION package jar "$@"
+ant -f build.xml -Dhadoopversion=200 -Dhadoop.version.full=$HADOOP_VERSION -Dhadoop.version=$HADOOP_VERSION -Dhbase.version=$HBASE_VERSION -Dzookeeper.version=$ZOOKEEPER_VERSION package jar "$@"
diff --git a/bigtop-packages/src/deb/sqoop/rules b/bigtop-packages/src/deb/sqoop/rules
index 8729dd53..7992dcde 100755
--- a/bigtop-packages/src/deb/sqoop/rules
+++ b/bigtop-packages/src/deb/sqoop/rules
@@ -31,7 +31,7 @@ override_dh_auto_build:
override_dh_auto_install:
sh -x debian/install_sqoop.sh \
- --build-dir=build/sqoop-${SQOOP_BASE_VERSION}.bin__hadoop-${HADOOP_BASE_VERSION} \
+ --build-dir=build/sqoop-${SQOOP_BASE_VERSION}.bin__hadoop-* \
--conf-dir=/etc/sqoop/conf.dist \
--prefix=debian/sqoop
cp debian/sqoop-metastore.sh debian/sqoop-metastore.init
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 0482c8a9..d1ac6fce 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -106,7 +106,7 @@ bash %{SOURCE1} -Dversion=%{sqoop_base_version}
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=build/sqoop-%{sqoop_base_version}.bin__hadoop-%{hadoop_base_version} \
+ --build-dir=build/sqoop-%{sqoop_base_version}.bin__hadoop-* \
--conf-dir=%{conf_sqoop_dist} \
--doc-dir=%{doc_sqoop} \
--prefix=$RPM_BUILD_ROOT