Repository: bigtop Updated Branches: refs/heads/BIGTOP-2320 cfc9e1469 -> 403e61db9
Adding pxf lib jars to the mix Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/403e61db Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/403e61db Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/403e61db Branch: refs/heads/BIGTOP-2320 Commit: 403e61db9b3bb28db5f206ba08704da766355b13 Parents: cfc9e14 Author: Cos <[email protected]> Authored: Mon Mar 7 21:36:59 2016 -0600 Committer: Cos <[email protected]> Committed: Mon Mar 7 21:36:59 2016 -0600 ---------------------------------------------------------------------- bigtop-packages/src/common/hawq/do-component-build | 3 +++ bigtop-packages/src/common/hawq/install_hawq.sh | 7 +++++++ bigtop-packages/src/deb/hawq/control | 2 +- bigtop-packages/src/rpm/hawq/SPECS/hawq.spec | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/403e61db/bigtop-packages/src/common/hawq/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/do-component-build b/bigtop-packages/src/common/hawq/do-component-build index 82436a5..5da8103 100755 --- a/bigtop-packages/src/common/hawq/do-component-build +++ b/bigtop-packages/src/common/hawq/do-component-build @@ -67,3 +67,6 @@ if [ $? != 0 ]; then echo HAWQ make install failed. exit 1 fi + +cd pxf +./gradlew distTar http://git-wip-us.apache.org/repos/asf/bigtop/blob/403e61db/bigtop-packages/src/common/hawq/install_hawq.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/install_hawq.sh b/bigtop-packages/src/common/hawq/install_hawq.sh index 85b94c8..0b860be 100755 --- a/bigtop-packages/src/common/hawq/install_hawq.sh +++ b/bigtop-packages/src/common/hawq/install_hawq.sh @@ -147,3 +147,10 @@ EOF chmod 755 $wrapper install -d -m 0755 $PREFIX/usr/bin + +install -d -m 0755 $PREFIX/$LIB_DIR/pxf +UNZIP_DIR=pxf +PXF_MODULES="pxf-hive pxf-hdfs pxf-service pxf-hbase pxf-api" +for mod in $PXF_MODULES; do + tar zxf $UNZIP_DIR/$mod/build/distributions/*tar.gz -C $PREFIX/$LIB_DIR/pxf/ +done http://git-wip-us.apache.org/repos/asf/bigtop/blob/403e61db/bigtop-packages/src/deb/hawq/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hawq/control b/bigtop-packages/src/deb/hawq/control index 48d9dcf..269a809 100644 --- a/bigtop-packages/src/deb/hawq/control +++ b/bigtop-packages/src/deb/hawq/control @@ -22,7 +22,7 @@ Homepage: http://hawq.incubator.apache.org/ Package: hawq Architecture: all -Depends: adduser, hadoop-hdfs, bigtop-utils (>= 1.1.0) +Depends: adduser, hadoop-hdfs, bigtop-utils (>= 1.1.0), bigtop-tomcat Description: HAWQ (incubating) is an advanced analytics MPP database Package: hawq-doc http://git-wip-us.apache.org/repos/asf/bigtop/blob/403e61db/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec b/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec index 84c597a..606b047 100644 --- a/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec +++ b/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec @@ -24,6 +24,8 @@ %define hawq_username hawq %define vcs_tag incubator-%{name}-%{hawq_version}-beta-incubating-RC4 +%define pxf %{hawq_home}/pxf + %if %{?suse_version:1}0 # Only tested on openSUSE 11.4. le'ts update it for previous release when confirmed @@ -87,7 +89,7 @@ Source4: init.d.tmpl Source5: hawq.default Source6: hawq-segment.svc Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service -Requires: hadoop-hdfs, bigtop-utils >= 1.0 +Requires: hadoop-hdfs, bigtop-utils >= 1.0, bigtop-tomcat %if 0%{?mgaversion} Requires: bsh-utils @@ -183,3 +185,5 @@ fi %files doc %defattr(-,root,root) %doc %{doc_hawq} + +%clean
