Repository: bigtop Updated Branches: refs/heads/BIGTOP-2320 25ba61acb -> 06a2d1d04
BIGTOP-2321. Running a real build now. Still toolchain work is in order Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/06a2d1d0 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/06a2d1d0 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/06a2d1d0 Branch: refs/heads/BIGTOP-2320 Commit: 06a2d1d0406e13728b175ebe03a8c98a2d89b2a1 Parents: 25ba61a Author: Konstantin Boudnik <[email protected]> Authored: Thu Feb 11 18:45:34 2016 +0300 Committer: Konstantin Boudnik <[email protected]> Committed: Thu Feb 11 18:45:34 2016 +0300 ---------------------------------------------------------------------- .../src/common/hawq/do-component-build | 25 ++++++++++++++------ bigtop-packages/src/rpm/hawq/SPECS/hawq.spec | 6 ++--- bigtop.bom | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/06a2d1d0/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 3af166f..bb708ac 100755 --- a/bigtop-packages/src/common/hawq/do-component-build +++ b/bigtop-packages/src/common/hawq/do-component-build @@ -18,11 +18,22 @@ set -ex . `dirname $0`/bigtop.bom -echo "Later we'll be running a real build here.\n \ -For the time being just pretend we did" +#docker run --rm=true -v `pwd`:/data -u root rlei/mydocker:latest /bin/sh -c " -echo "Now we'll be just unpacking a pre-built binary tarball" - -tar zxf ~/work/bigtop/hawq-2.0.0-incubating.tgz - -echo "Pre-built binaries are unpacked" +echo "Running the native build" +date; +./configure --prefix=`pwd`/hawq +if [ $? != 0 ]; then + echo HAWQ configure failed. + exit 1 +fi +make -j8 +if [ $? != 0 ]; then + echo HAWQ compile failed. + exit 1 +fi +make install +if [ $? != 0 ]; then + echo HAWQ make install failed. + exit 1 +fi http://git-wip-us.apache.org/repos/asf/bigtop/blob/06a2d1d0/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 39fdcdf..64c2a8f 100644 --- a/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec +++ b/bigtop-packages/src/rpm/hawq/SPECS/hawq.spec @@ -22,7 +22,7 @@ %define pids_hawq %{hawq_home}/pids %define man_dir %{_mandir} %define hawq_username hawq -%define vcs_tag %{hawq_version} +%define vcs_tag incubator-%{name}-%{hawq_version}-beta-incubating-RC4 %if %{?suse_version:1}0 @@ -79,7 +79,7 @@ URL: http://hawq.incubator.apache.org/ Group: Development/Libraries Buildroot: %{_topdir}/INSTALL/%{name}-%{version} License: APL2 -Source0: hawq-%{hawq_base_version}.tar.gz +Source0: %{vcs_tag}.tar.gz Source1: do-component-build Source2: install_hawq.sh Source3: hawq.svc @@ -106,7 +106,7 @@ BuildArch: noarch Documentation for Hawq platform %prep -%setup -n hawq-%{vcs_tag} +%setup -n %{vcs_tag} %build bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/06a2d1d0/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 17cb333..213fad8 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -406,7 +406,7 @@ bigtop { relNotes = 'Apache HAWQ (incubating)' version { base = '2.0.0'; pkg = base; release = 1 } tarball { source = "${version.base}-beta-incubating-RC4.tar.gz" - destination = "$name-${version.base}.tar.gz" } + destination = "incubator-${name}-${version.base}-beta-incubating-RC4.tar.gz" } url { download_path = "/apache/incubator-$name/archive" site = "https://github.com/${download_path}"; archive = site }
