Repository: bigtop Updated Branches: refs/heads/master 42eeeee9e -> f7fc0fe78
BIGTOP-1486. Upgrade Hue to 3.7 Apply Cherry-pick from upstream for FetchResults Support Fixing hue.ini for Bigtop Adding hue-impala and hue-security Use 3.7.1 to fix pom.xml reverting [BIGTOP-1548] Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f7fc0fe7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f7fc0fe7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f7fc0fe7 Branch: refs/heads/master Commit: f7fc0fe784b681990b281a6d7a619d4a76371cd3 Parents: 42eeeee Author: Olaf Flebbe <[email protected]> Authored: Mon Jan 26 15:49:01 2015 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Mon Jan 26 22:41:28 2015 +0100 ---------------------------------------------------------------------- .../src/common/hue/do-component-build | 5 +- bigtop-packages/src/deb/hue/control | 38 +++++++++++----- bigtop-packages/src/deb/hue/rules | 2 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 48 +++++++++++++++++++- bigtop.mk | 4 +- 5 files changed, 78 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7fc0fe7/bigtop-packages/src/common/hue/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/do-component-build b/bigtop-packages/src/common/hue/do-component-build index 36ed8a4..f3df5b1 100644 --- a/bigtop-packages/src/common/hue/do-component-build +++ b/bigtop-packages/src/common/hue/do-component-build @@ -20,10 +20,7 @@ set -ex #FIXME: this needs to be fixed upstream sed -i -e "s#${FULL_VERSION}-SNAPSHOT#${FULL_VERSION}#g" `grep -lR ${FULL_VERSION}-SNAPSHOT .` -# FIXME: this needs to be fixed upstream -sed -i -e 's#2.2.0-mr1-cdh5.0.0-SNAPSHOT#2.3.0-mr1-cdh5.1.4#' maven/pom.xml - -make MAVEN_VERSION='$(HUE_BASE_VERSION)' apps docs +make MAVEN_VERSION=${HUE_VERSION} apps docs # Make the entire tree relocatable bash tools/relocatable.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7fc0fe7/bigtop-packages/src/deb/hue/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index 71ea387..34c9920 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -17,8 +17,7 @@ Source: hue Section: misc Priority: extra Maintainer: Apache Bigtopr <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), python2.4-dev | python2.5-dev | python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools, libkrb5-dev -Depends: libsasl2, libsqlite3, zlib1g, libxslt1, libxml2 +Build-Depends: debhelper (>= 7.0.50~), python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools, libkrb5-dev Standards-Version: 3.8.0 Homepage: http://github.com/cloudera/hue @@ -31,7 +30,7 @@ Description: A browser-based desktop interface for Hadoop Package: hue Architecture: all -Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-pig (= ${source:Version}), hue-hbase (= ${source:Version}), hue-search (= ${source:Version}), hue-sqoop (= ${source:Version}), hue-rdbms (= ${source:Version}), hue-spark (= ${source:Version}), hue-zookeeper (= ${source:Version}) +Depends: hue-common (= ${source:Version}), hue-server (= ${source:Version}), hue-beeswax (= ${source:Version}), hue-impala (= ${source:Version}), hue-pig (= ${source:Version}), hue-hbase (= ${source:Version}), hue-search (= ${source:Version}), hue-sqoop (= ${source:Version}), hue-rdbms (= ${source:Version}), hue-security (= ${source:Version}), hue-spark (= ${source:Version}), hue-zookeeper (= ${source:Version}) Description: The hue metapackage Hue is a browser-based desktop interface for interacting with Hadoop. It supports a file browser, job tracker interface, cluster health monitor, and more. @@ -49,16 +48,25 @@ Description: Documentation for Hue Package: hue-beeswax Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}), hive +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}), hive (>= 0.13) Description: A UI for Hive on Hue Beeswax is a web interface for Hive. . It allows users to construct and run queries on Hive, manage tables, and import and export data. +Package: hue-impala +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Description: A UI for Impala + A web interface for Impala. + . + It allows users to construct and run Imapala jobs. + + Package: hue-pig Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for Pig on Hue A web interface for Pig. . @@ -66,7 +74,7 @@ Description: A UI for Pig on Hue Package: hue-hbase Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for HBase on Hue A web interface for HBase. . @@ -74,13 +82,13 @@ Description: A UI for HBase on Hue Package: hue-sqoop Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for Sqoop on Hue A web interface to Sqoop. Package: hue-search Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for Search on Hue A web interface to Search. . @@ -88,15 +96,23 @@ Description: A UI for Search on Hue Package: hue-rdbms Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for RDBMS on Hue A web interface to RDBMS. . It allows users to interact with RDBMS +Package: hue-security +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Description: A UI for Spark on Hue + A web interface to roles and security. + . + It allows users to interact with Hive roles + Package: hue-spark Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for Spark on Hue A web interface to Spark. . @@ -104,7 +120,7 @@ Description: A UI for Spark on Hue Package: hue-zookeeper Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) Description: A UI for Zookeeper on Hue A web interface to Zookeeper. . http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7fc0fe7/bigtop-packages/src/deb/hue/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index a63d6e0..2ff28c7 100755 --- a/bigtop-packages/src/deb/hue/rules +++ b/bigtop-packages/src/deb/hue/rules @@ -23,7 +23,7 @@ # Implicit targets SHELL := /bin/bash -APPS=beeswax pig hbase sqoop search rdbms spark zookeeper +APPS=beeswax impala pig hbase sqoop search security rdbms spark zookeeper $(APPS:%=debian/hue-%.postinst): debian/hue-app.postinst.tpl sed -e 's#@APP@#$(patsubst debian/hue-%.postinst,%,$@)#' < $< > $@ http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7fc0fe7/bigtop-packages/src/rpm/hue/SPECS/hue.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec index 7c3eed1..8bc50bd 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -26,15 +26,18 @@ Source1: %{name}.init Source2: %{name}.init.suse Source3: do-component-build Source4: install_hue.sh +#BIGTOP_PATCH_FILES URL: http://github.com/cloudera/hue Requires: %{name}-common = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} +Requires: %{name}-impala = %{version}-%{release} Requires: %{name}-beeswax = %{version}-%{release} Requires: %{name}-pig = %{version}-%{release} Requires: %{name}-hbase = %{version}-%{release} Requires: %{name}-sqoop = %{version}-%{release} Requires: %{name}-search = %{version}-%{release} Requires: %{name}-rdbms = %{version}-%{release} +Requires: %{name}-security = %{version}-%{release} Requires: %{name}-spark = %{version}-%{release} Requires: %{name}-zookeeper = %{version}-%{release} @@ -81,6 +84,8 @@ AutoReqProv: no %define apps_dir %{hue_dir}/apps %define about_app_dir %{hue_dir}/apps/about +%define impala_app_dir %{hue_dir}/apps/impala +%define security_app_dir %{hue_dir}/apps/security %define beeswax_app_dir %{hue_dir}/apps/beeswax %define oozie_app_dir %{hue_dir}/apps/oozie %define pig_app_dir %{hue_dir}/apps/pig @@ -145,6 +150,7 @@ It supports a file browser, job tracker interface, cluster health monitor, and m %prep %setup -n %{name}-release-%{hue_base_version} +#BIGTOP_PATCH_COMMANDS ######################################## # Build ######################################## @@ -176,6 +182,7 @@ BuildRequires: libxml2-devel, libxslt-devel, zlib-devel BuildRequires: cyrus-sasl-devel BuildRequires: openssl BuildRequires: krb5-devel +BuildRequires: asciidoc Group: Applications/Engineering Requires: cyrus-sasl-gssapi, libxml2, libxslt, zlib, python, sqlite # The only reason we need the following is because we also have AutoProv: no @@ -279,8 +286,10 @@ fi %attr(0755,%{username},%{username}) /var/log/hue %attr(0755,%{username},%{username}) /var/lib/hue -# beeswax and pig are packaged as a plugin app +# these apps are packaged as a plugin app %exclude %{beeswax_app_dir} +%exclude %{impala_app_dir} +%exclude %{security_app_dir} %exclude %{pig_app_dir} %exclude %{hbase_app_dir} %exclude %{sqoop_app_dir} @@ -337,6 +346,25 @@ fi if [ $1 -ge 1 ]; then service %{name} condrestart >/dev/null 2>&1 fi +#### HUE-IMPALA PLUGIN ###### +%package -n %{name}-impala +Summary: A UI for Impala on Hue +Group: Applications/Engineering +Requires: %{name}-common = %{version}-%{release}, make + +%description -n %{name}-impala +Beeswax is a web interface for Impala. + +It allows users to construct and run queries on Imapala, manage tables, +and import and export data. + +%app_post_macro impala +%app_preun_macro impala + +%files -n %{name}-impala +%defattr(-, %{username}, %{username}) +%{impala_app_dir} + #### HUE-BEESWAX PLUGIN ###### %package -n %{name}-beeswax @@ -445,6 +473,24 @@ It allows users to interact with RDBMS %defattr(-, %{username}, %{username}) %{rdbms_app_dir} +#### HUE-SECURITY PLUGIN ###### +%package -n %{name}-security +Summary: A UI for Security and Roles on Hue +Group: Applications/Engineering +Requires: %{name}-common = %{version}-%{release} + +%description -n %{name}-security +A web interface for Roles and Security. + +It allows users to interact with Roles and Security + +%app_post_macro security +%app_preun_macro security + +%files -n %{name}-security +%defattr(-, %{username}, %{username}) +%{security_app_dir} + #### HUE-SPARK PLUGIN ###### %package -n %{name}-spark Summary: A UI for Spark on Hue http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7fc0fe7/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 9991c4a..e56386a 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -179,8 +179,8 @@ $(eval $(call PACKAGE,giraph,GIRAPH)) HUE_NAME=hue HUE_RELNOTES_NAME=Hadoop User Experience HUE_PKG_NAME=hue -HUE_BASE_VERSION=3.6.0 -HUE_PKG_VERSION=3.6.0 +HUE_BASE_VERSION=3.7.1 +HUE_PKG_VERSION=3.7.1 HUE_RELEASE_VERSION=1 HUE_TARBALL_DST=hue-$(HUE_BASE_VERSION).tar.gz HUE_TARBALL_SRC=release-$(HUE_BASE_VERSION).tar.gz
