Author: rvs
Date: Wed Sep 28 18:42:41 2011
New Revision: 1177012
URL: http://svn.apache.org/viewvc?rev=1177012&view=rev
Log:
Enabling sqoop
Added:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/branches/hadoop-0.22/bigtop.mk
Added:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch?rev=1177012&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
(added)
+++
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
Wed Sep 28 18:42:41 2011
@@ -0,0 +1,43 @@
+Index: sqoop-1.3.0/ivy.xml
+===================================================================
+--- sqoop-1.3.0.orig/ivy.xml 2011-09-27 10:28:59.474837063 -0700
++++ sqoop-1.3.0/ivy.xml 2011-09-27 10:28:46.733590903 -0700
+@@ -66,10 +66,18 @@
+ </publications>
+ <dependencies>
+ <!-- Dependencies for Cloudera's Distribution for Hadoop -->
+- <dependency org="com.cloudera.hadoop" name="hadoop-core"
+- rev="${hadoop-core.cloudera.version}" conf="cloudera->default"/>
+- <dependency org="com.cloudera.hadoop" name="hadoop-test"
+- rev="${hadoop-core.cloudera.version}" conf="clouderatest->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}"
++ conf="cloudera->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-common-test"
rev="${hadoop-common.version}"
++ conf="clouderatest->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
++ conf="cloudera->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}"
++ conf="clouderatest->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-mapred"
rev="${hadoop-mapred.version}"
++ conf="cloudera->default"/>
++ <dependency org="org.apache.hadoop" name="hadoop-mapred-test"
rev="${hadoop-mapred.version}"
++ conf="clouderatest->default"/>
+
+
+ <!-- Common dependencies for Sqoop -->
+ <dependency org="commons-cli" name="commons-cli"
+Index: sqoop-1.3.0/ivy/libraries.properties
+===================================================================
+--- sqoop-1.3.0.orig/ivy/libraries.properties 2011-09-27 10:30:10.136087155
-0700
++++ sqoop-1.3.0/ivy/libraries.properties 2011-09-27 10:29:29.734839438
-0700
+@@ -27,7 +27,9 @@
+ commons-logging.version=1.0.4
+
+ # Cloudera Distribution dependency version
+-hadoop-core.cloudera.version=0.20.2-737
++hadoop-common.version=0.22.0-SNAPSHOT
++hadoop-hdfs.version=0.22.0-SNAPSHOT
++hadoop-mapred.version=0.22.0-SNAPSHOT
+
+ hbase.version=0.89.20100924-28
+ zookeeper.version=3.3.1+7
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
Wed Sep 28 18:42:41 2011
@@ -25,6 +25,7 @@ export DH_OPTIONS
patch: patch-stamp
patch-stamp:
+ patch -p1 < debian/patch
touch $@
clean:
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
Wed Sep 28 18:42:41 2011
@@ -40,6 +40,7 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: sqoop-metastore.sh
Source4: sqoop-metastore.sh.suse
+Patch0: patch
Buildarch: noarch
BuildRequires: asciidoc, xmlto
Prereq: hadoop
@@ -69,6 +70,7 @@ server for Sqoop clients across a networ
%prep
%setup -n sqoop-%{sqoop_base_version}
+%patch0 -p1
%build
bash %{SOURCE1} -Dversion=%{version}
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop.mk?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop.mk Wed Sep 28 18:42:41 2011
@@ -83,8 +83,8 @@ $(eval $(call PACKAGE,hive,HIVE))
SQOOP_NAME=sqoop
SQOOP_RELNOTES_NAME=Sqoop
SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.2.0
-SQOOP_PKG_VERSION=1.2.0
+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)
