You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2017/01/05 09:42:14 UTC
bigtop git commit: BIGTOP-2657: Upgrade to Hue 3.11.0
Repository: bigtop
Updated Branches:
refs/heads/master dc6a0b3a9 -> 93fed9c30
BIGTOP-2657: Upgrade to Hue 3.11.0
Signed-off-by: Olaf Flebbe <of...@oflebbe.de>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/93fed9c3
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/93fed9c3
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/93fed9c3
Branch: refs/heads/master
Commit: 93fed9c30d00e773017b25a2a6940ae62c68ac76
Parents: dc6a0b3
Author: Zach York <zy...@amazon.com>
Authored: Tue Jan 3 17:24:46 2017 -0800
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Thu Jan 5 10:45:11 2017 +0100
----------------------------------------------------------------------
bigtop-packages/src/deb/hue/control | 4 ++--
bigtop-packages/src/deb/hue/docs | 2 +-
bigtop-packages/src/deb/hue/hue-common.install | 2 +-
bigtop-packages/src/rpm/hue/SPECS/hue.spec | 6 +++---
bigtop.bom | 2 +-
bigtop_toolchain/manifests/packages.pp | 17 +++++++++++------
6 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/bigtop-packages/src/deb/hue/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control
index 5fd694f..e1240d9 100644
--- a/bigtop-packages/src/deb/hue/control
+++ b/bigtop-packages/src/deb/hue/control
@@ -17,13 +17,13 @@ Source: hue
Section: misc
Priority: extra
Maintainer: Apache Bigtopr <de...@bigtop.apache.org>
-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, libgmp-dev
+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, libgmp3-dev, libffi-dev
Standards-Version: 3.9.4
Homepage: http://github.com/cloudera/hue
Package: hue-common
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${build:SYS-PYTHON}, libsasl2-modules-gssapi-mit, libxslt1.1, make, python (>= 2.6), libgmp10
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${build:SYS-PYTHON}, libsasl2-modules-gssapi-mit, libxslt1.1, make, python (>= 2.6), libgmp10, libffi
Description: A browser-based desktop interface for Hadoop
Hue is a browser-based desktop interface for interacting with Hadoop.
It supports a file browser, job tracker interface, cluster health monitor, and more.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/bigtop-packages/src/deb/hue/docs
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hue/docs b/bigtop-packages/src/deb/hue/docs
index a1320b1..b43bf86 100644
--- a/bigtop-packages/src/deb/hue/docs
+++ b/bigtop-packages/src/deb/hue/docs
@@ -1 +1 @@
-README.rst
+README.md
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/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 8a4b2bb..35985fe 100644
--- a/bigtop-packages/src/deb/hue/hue-common.install
+++ b/bigtop-packages/src/deb/hue/hue-common.install
@@ -8,7 +8,7 @@
/usr/lib/hue/Makefile.sdk
/usr/lib/hue/Makefile.vars
/usr/lib/hue/Makefile.vars.priv
-/usr/lib/hue/README.rst
+/usr/lib/hue/README.md
/usr/lib/hue/tools
/usr/lib/hue/VERSION
/usr/lib/hue/build/env/bin/*
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/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 13694d4..14bdc9f 100644
--- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec
+++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
@@ -188,8 +188,9 @@ BuildRequires: openssl-devel
BuildRequires: krb5-devel
BuildRequires: asciidoc
BuildRequires: gmp-devel
+BuildRequires: libffi-devel
Group: Applications/Engineering
-Requires: cyrus-sasl-gssapi, libxml2, libxslt, zlib, sqlite, libyaml, gmp
+Requires: cyrus-sasl-gssapi, libxml2, libxslt, zlib, sqlite, libyaml, gmp, python, libffi
# The only reason we need the following is because we also have AutoProv: no
Provides: config(%{name}-common) = %{version}
@@ -202,7 +203,6 @@ BuildRequires: /sbin/runuser, sqlite-devel, openldap-devel, mysql-devel, openssl
# Required for init scripts
Requires: /lib/lsb/init-functions
BuildRequires: python-devel, python-setuptools
-Requires: python
%endif
# Disable automatic Provides generation - otherwise we will claim to provide all of the
@@ -270,7 +270,7 @@ fi
%{hue_dir}/Makefile.sdk
%{hue_dir}/Makefile.vars
%{hue_dir}/Makefile.vars.priv
-%{hue_dir}/README.rst
+%{hue_dir}/README.md
%{hue_dir}/tools
%{hue_dir}/VERSION
%{hue_dir}/build/env/bin/*
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index 45fd248..d02ab80 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -248,7 +248,7 @@ bigtop {
'hue' {
name = 'hue'
relNotes = 'Hadoop User Interface'
- version { base = '3.9.0'; pkg = base; release = 1 }
+ version { base = '3.11.0'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "release-${version.base}.tar.gz" }
url { site = "https://github.com/cloudera/hue/archive"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/93fed9c3/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index d2602b2..5938326 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -67,7 +67,8 @@ class bigtop_toolchain::packages {
"libevent-devel",
"apr-devel",
"bison",
- "perl-Env"
+ "perl-Env",
+ "libffi-devel"
]
}
/(?i:(SLES|opensuse))/: { $pkgs = [
@@ -111,7 +112,8 @@ class bigtop_toolchain::packages {
"libcurl-devel",
"libevent-devel",
"bison",
- "flex"
+ "flex",
+ "libffi-devel"
]
# fix package dependencies: BIGTOP-2120 and BIGTOP-2152 and BIGTOP-2471
exec { '/usr/bin/zypper -n install --force-resolution krb5 libopenssl-devel':
@@ -149,9 +151,11 @@ class bigtop_toolchain::packages {
"openssl-devel",
"rpm-build",
"system-rpm-config",
- "fuse-libs","gmp-devel",
+ "fuse-libs",
+ "gmp-devel",
"snappy-devel",
- "bzip2-devel"
+ "bzip2-devel",
+ "libffi-devel"
] }
/(Ubuntu|Debian)/: { $pkgs = [
"unzip",
@@ -193,7 +197,7 @@ class bigtop_toolchain::packages {
"libkrb5-dev",
"asciidoc",
"libyaml-dev",
- "libgmp-dev",
+ "libgmp3-dev",
"libsnappy-dev",
"libboost-regex-dev",
"xfslibs-dev",
@@ -207,7 +211,8 @@ class bigtop_toolchain::packages {
"libcurl4-gnutls-dev",
"bison",
"flex",
- "python-dev"
+ "python-dev",
+ "libffi-dev"
]
file { '/etc/apt/apt.conf.d/01retries':
content => 'Aquire::Retries "5";'