Repository: bigtop Updated Branches: refs/heads/master b39748a22 -> be7248cda
BIGTOP-1331. bump Hue version to 3.6.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/be7248cd Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/be7248cd Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/be7248cd Branch: refs/heads/master Commit: be7248cdaa0878541a25ff96c313c056222a0e3d Parents: b39748a Author: Roman Shaposhnik <[email protected]> Authored: Sat Jun 28 03:04:43 2014 +0000 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Jun 28 11:52:22 2014 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hue/install_hue.sh | 7 +-- bigtop-packages/src/deb/hue/control | 26 +++++++- bigtop-packages/src/deb/hue/hue-common.install | 1 - bigtop-packages/src/deb/hue/hue-common.postinst | 5 -- bigtop-packages/src/deb/hue/hue-rdbms.install | 1 + bigtop-packages/src/deb/hue/hue-spark.install | 1 + .../src/deb/hue/hue-zookeeper.install | 1 + bigtop-packages/src/deb/hue/rules | 2 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 66 +++++++++++++++++++- bigtop.mk | 4 +- 10 files changed, 95 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/common/hue/install_hue.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh index 7dbc3a2..159ed3e 100644 --- a/bigtop-packages/src/common/hue/install_hue.sh +++ b/bigtop-packages/src/common/hue/install_hue.sh @@ -106,10 +106,6 @@ BUNDLED_BUILD_DIR=$PREFIX/$LIB_DIR/build install -d -m 0755 $PREFIX/$HADOOP_DIR ln -fs $LIB_DIR/desktop/libs/hadoop/java-lib/*plugin*jar $PREFIX/$HADOOP_DIR -# Hue Shell specific -install -d -m 0755 $PREFIX/$LIB_DIR/apps/shell/src/shell/build/ -cp -f $BUILD_DIR/apps/shell/src/shell/build/setuid $PREFIX/$LIB_DIR/apps/shell/src/shell/build - # Making the resulting tree relocatable # WARNING: We HAVE to run this twice, before and after the apps get registered. # we have to run it one time before so that the path to the interpreter @@ -121,7 +117,7 @@ cp -f $BUILD_DIR/apps/shell/src/shell/build/setuid $PREFIX/$LIB_DIR/apps/shell/s # Remove Hue database and then recreate it, but with just the "right" apps rm -f $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$LIB_DIR/app.reg -APPS="about filebrowser help proxy useradmin shell oozie jobbrowser jobsub metastore" +APPS="about filebrowser help proxy useradmin oozie jobbrowser jobsub metastore" export DESKTOP_LOG_DIR=$BUILD_DIR export DESKTOP_LOGLEVEL=WARN export ROOT=$PREFIX/$LIB_DIR @@ -195,7 +191,6 @@ mv $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$VAR_DIR # Move hue.pth to a var location mv $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/hue.pth $PREFIX/$VAR_DIR ln -s $VAR_DIR/hue.pth `ls -d $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/`/hue.pth -rm $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/hue.link.pth # Move app.reg to a var location mv $PREFIX/$LIB_DIR/app.reg $PREFIX/$VAR_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index d66ba65..71ea387 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -31,7 +31,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}) +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}) 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. @@ -86,3 +86,27 @@ Description: A UI for Search on Hue . It allows users to interact with Solr +Package: hue-rdbms +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), 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-spark +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Description: A UI for Spark on Hue + A web interface to Spark. + . + It allows users to interact with Spark + +Package: hue-zookeeper +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), python (<< 3), make (>= 3.8), hue-common (= ${source:Version}) +Description: A UI for Zookeeper on Hue + A web interface to Zookeeper. + . + It allows users to interact with Zookeeper + http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/hue-common.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-common.install b/bigtop-packages/src/deb/hue/hue-common.install index b910ca7..8a4b2bb 100644 --- a/bigtop-packages/src/deb/hue/hue-common.install +++ b/bigtop-packages/src/deb/hue/hue-common.install @@ -22,7 +22,6 @@ /usr/lib/hue/apps/jobbrowser /usr/lib/hue/apps/jobsub /usr/lib/hue/apps/proxy -/usr/lib/hue/apps/shell /usr/lib/hue/apps/useradmin /usr/lib/hue/apps/oozie /usr/lib/hue/apps/metastore http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/hue-common.postinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-common.postinst b/bigtop-packages/src/deb/hue/hue-common.postinst index d5e3760..9fbe3da 100644 --- a/bigtop-packages/src/deb/hue/hue-common.postinst +++ b/bigtop-packages/src/deb/hue/hue-common.postinst @@ -50,11 +50,6 @@ case "$1" in cp $OLD_DB /usr/share/hue/desktop/desktop.db fi fi - - # Take care of hue-shell setuid binary - SETUID=/usr/lib/hue/apps/shell/src/shell/build/setuid - chown root:hue $SETUID - chmod 4750 $SETUID ;; abort-upgrade|abort-remove|abort-deconfigure) http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/hue-rdbms.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-rdbms.install b/bigtop-packages/src/deb/hue/hue-rdbms.install new file mode 100644 index 0000000..b4c928a --- /dev/null +++ b/bigtop-packages/src/deb/hue/hue-rdbms.install @@ -0,0 +1 @@ +/usr/lib/hue/apps/rdbms http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/hue-spark.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-spark.install b/bigtop-packages/src/deb/hue/hue-spark.install new file mode 100644 index 0000000..4a3e3ea --- /dev/null +++ b/bigtop-packages/src/deb/hue/hue-spark.install @@ -0,0 +1 @@ +/usr/lib/hue/apps/spark http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/hue-zookeeper.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/hue-zookeeper.install b/bigtop-packages/src/deb/hue/hue-zookeeper.install new file mode 100644 index 0000000..cd30c81 --- /dev/null +++ b/bigtop-packages/src/deb/hue/hue-zookeeper.install @@ -0,0 +1 @@ +/usr/lib/hue/apps/zookeeper http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop-packages/src/deb/hue/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/rules b/bigtop-packages/src/deb/hue/rules index cf86421..a63d6e0 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 +APPS=beeswax pig hbase sqoop search 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/be7248cd/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 8f150ee..6db01fe 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -34,6 +34,9 @@ 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}-spark = %{version}-%{release} +Requires: %{name}-zookeeper = %{version}-%{release} ################ RPM CUSTOMIZATION ############################## @@ -87,12 +90,14 @@ AutoReqProv: no %define jobbrowser_app_dir %{hue_dir}/apps/jobbrowser %define jobsub_app_dir %{hue_dir}/apps/jobsub %define proxy_app_dir %{hue_dir}/apps/proxy -%define shell_app_dir %{hue_dir}/apps/shell %define useradmin_app_dir %{hue_dir}/apps/useradmin %define etc_hue /etc/hue/conf %define hbase_app_dir %{hue_dir}/apps/hbase %define sqoop_app_dir %{hue_dir}/apps/sqoop %define search_app_dir %{hue_dir}/apps/search +%define rdbms_app_dir %{hue_dir}/apps/rdbms +%define spark_app_dir %{hue_dir}/apps/spark +%define zookeeper_app_dir %{hue_dir}/apps/zookeeper # Path to the HADOOP_HOME to build against - these @@ -269,10 +274,8 @@ fi %{jobsub_app_dir} %{proxy_app_dir} %{useradmin_app_dir} -%{shell_app_dir} %{metastore_app_dir} %{oozie_app_dir} -%attr(4750,root,hue) %{shell_app_dir}/src/shell/build/setuid %attr(0755,%{username},%{username}) /var/log/hue %attr(0755,%{username},%{username}) /var/lib/hue @@ -282,6 +285,9 @@ fi %exclude %{hbase_app_dir} %exclude %{sqoop_app_dir} %exclude %{search_app_dir} +%exclude %{rdbms_app_dir} +%exclude %{spark_app_dir} +%exclude %{zookeeper_app_dir} ############################################################ @@ -420,3 +426,57 @@ It allows users to interact with Solr %files -n %{name}-search %defattr(-, %{username}, %{username}) %{search_app_dir} + +#### HUE-RDBMS PLUGIN ###### +%package -n %{name}-rdbms +Summary: A UI for RDBMS on Hue +Group: Applications/Engineering +Requires: %{name}-common = %{version}-%{release} + +%description -n %{name}-rdbms +A web interface for RDBMS. + +It allows users to interact with RDBMS + +%app_post_macro rdbms +%app_preun_macro rdbms + +%files -n %{name}-rdbms +%defattr(-, %{username}, %{username}) +%{rdbms_app_dir} + +#### HUE-SPARK PLUGIN ###### +%package -n %{name}-spark +Summary: A UI for Spark on Hue +Group: Applications/Engineering +Requires: %{name}-common = %{version}-%{release} + +%description -n %{name}-spark +A web interface for Spark. + +It allows users to interact with Spark + +%app_post_macro spark +%app_preun_macro spark + +%files -n %{name}-spark +%defattr(-, %{username}, %{username}) +%{spark_app_dir} + +#### HUE-ZOOKEEPER PLUGIN ###### +%package -n %{name}-zookeeper +Summary: A UI for Zookeeper on Hue +Group: Applications/Engineering +Requires: %{name}-common = %{version}-%{release} + +%description -n %{name}-zookeeper +A web interface for Zookeeper. + +It allows users to interact with Zookeeper + +%app_post_macro zookeeper +%app_preun_macro zookeeper + +%files -n %{name}-zookeeper +%defattr(-, %{username}, %{username}) +%{zookeeper_app_dir} http://git-wip-us.apache.org/repos/asf/bigtop/blob/be7248cd/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 201301b..b41e3bb 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -172,8 +172,8 @@ $(eval $(call PACKAGE,giraph,GIRAPH)) HUE_NAME=hue HUE_RELNOTES_NAME=Hadoop User Experience HUE_PKG_NAME=hue -HUE_BASE_VERSION=2.5.2 -HUE_PKG_VERSION=2.5.2 +HUE_BASE_VERSION=3.6.0 +HUE_PKG_VERSION=3.6.0 HUE_RELEASE_VERSION=1 HUE_TARBALL_DST=hue-$(HUE_BASE_VERSION).tar.gz HUE_TARBALL_SRC=release-$(HUE_BASE_VERSION).tar.gz
