Repository: bigtop Updated Branches: refs/heads/master 85d9001dd -> 92bd68306
BIGTOP-1757. bigtop_toolchain has to differentiate between centos6 and centos7 Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/92bd6830 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/92bd6830 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/92bd6830 Branch: refs/heads/master Commit: 92bd683065c7a07f7effc2effd0c3ca24c19ae13 Parents: 85d9001 Author: Evans Ye <[email protected]> Authored: Sun Mar 29 04:45:41 2015 +0000 Committer: Olaf Flebbe <[email protected]> Committed: Sun Mar 29 11:59:43 2015 +0200 ---------------------------------------------------------------------- bigtop_toolchain/manifests/packages.pp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/92bd6830/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 3cd21c8..2f2fc23 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -15,7 +15,15 @@ class bigtop_toolchain::packages { case $operatingsystem{ - /(?i:(centos|fedora))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", "mysql-devel", "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto" ] } + /(?i:(centos|fedora))/: { + # Fedora 20 and CentOS 7 or above are using mariadb, while CentOS 6 is still mysql + if ($operatingsystem == "CentOS") and ($operatingsystemmajrelease <=6) { + $mysql_devel="mysql-devel" + } else { + $mysql_devel="mariadb-devel" + } + $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto" ] + } /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "libcppunit-devel", "libopenssl-devel", "rpm-devel", "pkg-config" ] } Amazon: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "openssl-devel", "rpm-build", "system-rpm-config", "fuse-libs", ] } /(Ubuntu|Debian)/: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java", "python2.7-dev", "libxml2-dev", "libxslt1-dev", "zlib1g-dev", "libsqlite3-dev", "libldap2-dev", "libsasl2-dev", "libmysqlclient-dev", "python-setuptools", "libkrb5-dev", "asciidoc" ]
