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 2016/11/05 15:36:52 UTC
bigtop git commit: BIGTOP-2572: Fix bigtop_toolchain for suse
Repository: bigtop
Updated Branches:
refs/heads/master bb2e69b16 -> febd92793
BIGTOP-2572: Fix bigtop_toolchain for suse
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/febd9279
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/febd9279
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/febd9279
Branch: refs/heads/master
Commit: febd9279386bf0f153e3ae9d45920b7209af85dc
Parents: bb2e69b
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Fri Nov 4 23:28:53 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Nov 5 16:30:32 2016 +0100
----------------------------------------------------------------------
bigtop_toolchain/manifests/node.pp | 2 +-
bigtop_toolchain/manifests/packages.pp | 1 +
bigtop_toolchain/manifests/protobuf.pp | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/febd9279/bigtop_toolchain/manifests/node.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/node.pp b/bigtop_toolchain/manifests/node.pp
index 99efe1b..6b204f1 100644
--- a/bigtop_toolchain/manifests/node.pp
+++ b/bigtop_toolchain/manifests/node.pp
@@ -15,7 +15,7 @@
class bigtop_toolchain::node {
case $architecture {
- 'amd64' : { $node_version = "0.10.44"
+ /amd64|x86_64/ : { $node_version = "0.10.44"
$arch = "x64" }
'ppc64le' : { $node_version = "4.4.7"
$arch = "ppc64le" }
http://git-wip-us.apache.org/repos/asf/bigtop/blob/febd9279/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 8c2d489..84ccdc9 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -109,6 +109,7 @@ class bigtop_toolchain::packages {
"libuuid-devel",
"libbz2-devel",
"libcurl-devel",
+ "libevent-devel",
"bison",
"flex"
]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/febd9279/bigtop_toolchain/manifests/protobuf.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp
index f688818..eed426e 100644
--- a/bigtop_toolchain/manifests/protobuf.pp
+++ b/bigtop_toolchain/manifests/protobuf.pp
@@ -59,15 +59,17 @@ class bigtop_toolchain::protobuf {
command => '/bin/true',
require => Yumrepo['protobuf'],
}
+ $package_name = 'protobuf-devel'
}
/(?i:(SLES|opensuse))/:{
exec { 'install_mrdocs_repo':
- command => '/usr/bin/zypper ar --no-gpgcheck http://download.opensuse.org/repositories/home:/mrdocs:/protobuf-rpm/openSUSE_13.2/ protobuf',
+ command => '/usr/bin/zypper ar --no-gpgcheck http://download.opensuse.org/repositories/home:/mrdocs:/protobuf-rpm/openSUSE_Leap_42.1/ protobuf',
unless => "/usr/bin/zypper lr | grep -q protobuf",
}
+ $package_name = 'protobuf-devel-2.5.0-4.1'
}
}
- package { 'protobuf-devel':
+ package { $package_name:
ensure => present,
require => Exec['install_mrdocs_repo'],
}