bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [2/3] bigtop git commit: BIGTOP-2152: Fix conflict with libressl-devel from mysql-devel
Date Thu, 19 Nov 2015 20:52:27 GMT
BIGTOP-2152: Fix conflict with libressl-devel from mysql-devel


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ec741b02
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ec741b02
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ec741b02

Branch: refs/heads/master
Commit: ec741b0203793036f2830444d38fe9879966844d
Parents: da40349
Author: Olaf Flebbe <of@ofleb.be>
Authored: Wed Nov 18 21:35:47 2015 +0100
Committer: Olaf Flebbe <of@ofleb.be>
Committed: Thu Nov 19 21:39:23 2015 +0100

----------------------------------------------------------------------
 bigtop_toolchain/manifests/packages.pp | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/ec741b02/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 8e16dc2..ed06015 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -25,7 +25,9 @@ class bigtop_toolchain::packages {
        $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", "libyaml-devel", "gmp-devel", "snappy-devel" ]
      }
     /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake",
"autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel",
"cppunit-devel", "libopenssl-devel", "rpm-devel", "pkg-config", "gmp-devel", "python-devel",
"python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite3-devel",
"openldap2-devel", "libyaml-devel", "krb5-devel", "asciidoc", "libmysqlclient-devel",  "snappy-devel"
]
+      # fix package dependencies: BIGTOP-2120 and BIGTOP-2152
       exec { '/usr/bin/zypper remove -y krb5-mini':
+      } -> exec {'/usr/bin/zypper install -y libopenssl-devel':
       } -> Package <| |>
     }
     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","gmp-devel", "snappy-devel"
] }


Mime
View raw message