Author: rvs
Date: Fri Feb 17 18:51:38 2012
New Revision: 1245704
URL: http://svn.apache.org/viewvc?rev=1245704&view=rev
Log:
BIGTOP-409. sqoop build fails on SLES
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/sqoop/rules
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=1245704&r1=1245703&r2=1245704&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
Fri Feb 17 18:51:38 2012
@@ -16,6 +16,6 @@
set -ex
-ant -f build.xml package "$@"
+ant -f build.xml -Dhadoopversion=23 package "$@"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/sqoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/sqoop/rules?rev=1245704&r1=1245703&r2=1245704&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/sqoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/sqoop/rules
Fri Feb 17 18:51:38 2012
@@ -25,7 +25,6 @@ export DH_OPTIONS
patch: patch-stamp
patch-stamp:
- patch -p0 < debian/patch
touch $@
clean:
@@ -38,7 +37,7 @@ clean:
build-indep: build-indep-stamp
build-indep-stamp: patch-stamp
- bash debian/do-component-build -Dversion=${SQOOP_VERSION}
-Divy.home=${HOME}/.ivy2
+ bash debian/do-component-build -Divy.home=${HOME}/.ivy2
touch $@
install: install-indep
@@ -46,7 +45,7 @@ install-indep:
dh_testdir
dh_testroot
sh -x debian/install_sqoop.sh \
- --build-dir=build/sqoop-${SQOOP_VERSION} \
+ --build-dir=build/sqoop-${SQOOP_BASE_VERSION} \
--conf-dir=/etc/sqoop/conf.dist \
--prefix=debian/sqoop
dh_install -i
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=1245704&r1=1245703&r2=1245704&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
Fri Feb 17 18:51:38 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
@@ -45,7 +60,6 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: sqoop-metastore.sh
Source4: sqoop-metastore.sh.suse
-Patch0: patch
Buildarch: noarch
BuildRequires: asciidoc, xmlto
Requires: hadoop, bigtop-utils
@@ -84,16 +98,15 @@ Shared metadata repository for Sqoop. Th
server for Sqoop clients across a network to use.
%prep
-%setup -n %{name}-%{sqoop_base_version}-incubating
-%patch0 -p0
+%setup -n %{name}-%{sqoop_base_version}-src
%build
-bash %{SOURCE1} -Dversion=%{version}
+bash %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=build/sqoop-%{version} \
+ --build-dir=build/sqoop-%{sqoop_base_version} \
--conf-dir=%{conf_sqoop_dist} \
--doc-dir=%{doc_sqoop} \
--prefix=$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=1245704&r1=1245703&r2=1245704&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Fri Feb 17 18:51:38 2012
@@ -79,14 +79,13 @@ $(eval $(call PACKAGE,hive,HIVE))
SQOOP_NAME=sqoop
SQOOP_RELNOTES_NAME=Sqoop
SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.4.0
-SQOOP_PKG_VERSION=1.4.0
+SQOOP_BASE_VERSION=1.4.1-incubating
+SQOOP_PKG_VERSION=1.4.1
SQOOP_RELEASE_VERSION=1
-SQOOP_TARBALL_DST=sqoop-$(SQOOP_BASE_VERSION).tar.gz
-SQOOP_TARBALL_SRC=sqoop-$(SQOOP_BASE_VERSION)-incubating.tar.gz
-SQOOP_SITE=$(APACHE_MIRROR)/incubator/sqoop/sqoop-$(SQOOP_BASE_VERSION)-incubating
-#SQOOP_SITE=https://github.com/apache/sqoop/tarball
-#SQOOP_TARBALL_SRC=1bf7cbf
+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/
$(eval $(call PACKAGE,sqoop,SQOOP))
# Oozie
