You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ju...@apache.org on 2018/09/06 01:12:47 UTC

bigtop git commit: BIGTOP-3077: OpenSuse-42.3 packages install error

Repository: bigtop
Updated Branches:
  refs/heads/branch-1.3 3b366ecb8 -> 0b2bf099b


BIGTOP-3077: OpenSuse-42.3 packages install error

Update libapr1 to use distro version. Fixed packages dependency issue
on aarch64.

Change-Id: I043b701b4bd5b89eea7488e21ace939624528310
Signed-off-by: Jun He <ju...@apache.org>


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

Branch: refs/heads/branch-1.3
Commit: 0b2bf099b70bcd69ada0f5ccb1e16a799f423155
Parents: 3b366ec
Author: Jun He <ju...@linaro.org>
Authored: Tue Sep 4 11:25:14 2018 +0800
Committer: Jun He <ju...@apache.org>
Committed: Thu Sep 6 01:12:07 2018 +0000

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


http://git-wip-us.apache.org/repos/asf/bigtop/blob/0b2bf099/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 180e26a..d526fb9 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -108,24 +108,13 @@ class bigtop_toolchain::packages {
         "bison",
         "flex",
         "libffi48-devel",
-        "texlive-latex-bin-bin"
+        "texlive-latex-bin-bin",
+        "libapr1",
+        "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  --force-resolution krb5 libopenssl-devel libxml2-devel libxslt-devel boost-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",