Author: rvs
Date: Wed Dec 14 00:27:57 2011
New Revision: 1214002
URL: http://svn.apache.org/viewvc?rev=1214002&view=rev
Log:
Updating Hive to 0.8.0 RC
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/do-component-build?rev=1214002&r1=1214001&r2=1214002&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/do-component-build
Wed Dec 14 00:27:57 2011
@@ -15,5 +15,4 @@
# limitations under the License.
set -ex
-# -f src/build.xml
-ant -Dhadoop.version=0.23.0 -Dhadoop.security.version=0.23.0
-Dhadoop.security.version.prefix=0.23 package "$@"
+ant -f src/build.xml -Dhadoop.version=0.23.0 -Dhadoop.security.version=0.23.0
-Dhadoop.security.version.prefix=0.23 package "$@"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules?rev=1214002&r1=1214001&r2=1214002&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hive/rules
Wed Dec 14 00:27:57 2011
@@ -26,14 +26,12 @@ export DH_OPTIONS
clean:
dh_testdir
dh_testroot
- ant clean
rm -f *-stamp
rm -Rf debian/.ivy
dh_clean
build-indep: build-indep-stamp
build-indep-stamp:
- patch -p0 < debian/patch
mkdir -p /tmp/debian-hive/.ivy
bash debian/do-component-build -Divy.home=${HOME}/.ivy2
touch $@
@@ -51,7 +49,7 @@ install-indep: metastore server
cp debian/hive.1 .
sh debian/install_hive.sh \
--prefix=debian/hadoop-hive \
- --build-dir=build/dist \
+ --build-dir=src/build/dist \
--doc-dir=debian/hadoop-hive/usr/share/doc/hive \
--python-dir=debian/python-hive/usr/share/python-support/python-hive/hive
dh_pysupport
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1214002&r1=1214001&r2=1214002&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SPECS/hive.spec
Wed Dec 14 00:27:57 2011
@@ -22,7 +22,7 @@
%define man_dir %{_mandir}
%define hive_services server metastore
# After we run "ant package" we'll find the distribution here
-%define hive_dist build/dist
+%define hive_dist src/build/dist
%if %{!?suse_version:1}0
@@ -70,7 +70,6 @@ Source5: hadoop-hive-server.default
Source6: hadoop-hive-metastore.default
Source7: hive.1
Source8: hive-site.xml
-Patch0: patch
Requires: hadoop >= 0.20.2, bigtop-utils
Obsoletes: %{name}-webinterface
@@ -115,8 +114,7 @@ This optional package hosts a metadata s
%prep
-%setup -n apache-hive-4910f33
-%patch0 -p0
+%setup -n hive-%{hive_version}
%build
bash %{SOURCE1}
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1214002&r1=1214001&r2=1214002&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Wed Dec 14 00:27:57 2011
@@ -73,14 +73,13 @@ $(eval $(call PACKAGE,pig,PIG))
HIVE_NAME=hive
HIVE_RELNOTES_NAME=Apache Hive
HIVE_PKG_NAME=hadoop-hive
-HIVE_BASE_VERSION=0.9.0
+HIVE_BASE_VERSION=0.8.0
HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
HIVE_RELEASE_VERSION=1
-HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
-#HIVE_TARBALL_SRC=$(HIVE_TARBALL_DST)
+HIVE_TARBALL_SRC=hive-$(HIVE_BASE_VERSION).tar.gz
+HIVE_TARBALL_DST=$(HIVE_TARBALL_SRC)
#HIVE_SITE=$(APACHE_MIRROR)/hive/hive-$(HIVE_BASE_VERSION)/
-HIVE_SITE=https://github.com/apache/hive/tarball
-HIVE_TARBALL_SRC=4910f33
+HIVE_SITE=http://people.apache.org/~cws/hive-0.8.0-candidate-4/
$(eval $(call PACKAGE,hive,HIVE))
# Sqoop
