You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/22 06:57:04 UTC

bigtop git commit: BIGTOP-2850. Not able to build bigtop/slaves image for OpenSuSE 42.1

Repository: bigtop
Updated Branches:
  refs/heads/branch-1.2 b3bd55846 -> ef61e5721


BIGTOP-2850. Not able to build bigtop/slaves image for OpenSuSE 42.1


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

Branch: refs/heads/branch-1.2
Commit: ef61e5721c31e0dc89b865a176298094e54401a2
Parents: b3bd558
Author: Evans Ye <ev...@apache.org>
Authored: Fri Jul 21 18:48:13 2017 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 22 14:55:53 2017 +0800

----------------------------------------------------------------------
 bigtop_toolchain/manifests/packages.pp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/ef61e572/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 7a15d3b..16a1dbf 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -113,24 +113,12 @@ class bigtop_toolchain::packages {
         "libevent-devel",
         "bison",
         "flex",
-        "libffi48-devel"
+        "libffi48-devel",
+        "libapr1-devel"
       ]
       # fix package dependencies: BIGTOP-2120 and BIGTOP-2152 and BIGTOP-2471
-      exec { '/usr/bin/zypper -n install  --force-resolution krb5 libopenssl-devel':
+      exec { '/usr/bin/zypper -n install libopenssl-devel':
       } -> Package <| |>
-      # fix package libapr1
-      exec { 'suse_12.3_repo':
-        command => '/usr/bin/zypper ar --no-gpgcheck http://download.opensuse.org/distribution/12.3/repo/oss/suse/ libapr1',
-        unless => "/usr/bin/zypper lr | grep -q libapr1",
-      }
-      package { 'libapr1':
-        ensure => '1.4.6',
-        require => [Exec['suse_12.3_repo']]
-      }
-      package { 'libapr1-devel':
-        ensure => '1.4.6',
-        require => [Package['libapr1']]
-      }
     }
     /Amazon/: { $pkgs = [
       "unzip",