Repository: bigtop Updated Branches: refs/heads/branch-1.3 0b2bf099b -> e9f38ab11 (forced update)
BIGTOP-3077: OpenSuse-42.3 packages install error Update libapr1 to use distro version. Fixed packages dependency issue on aarch64. This closes #390 Change-Id: I043b701b4bd5b89eea7488e21ace939624528310 Signed-off-by: Jun He <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e9f38ab1 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e9f38ab1 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e9f38ab1 Branch: refs/heads/branch-1.3 Commit: e9f38ab11984a8221baa0eca83c517919a767243 Parents: 3b366ec Author: Jun He <[email protected]> Authored: Tue Sep 4 11:25:14 2018 +0800 Committer: Jun He <[email protected]> Committed: Thu Sep 6 01:14:08 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/e9f38ab1/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",
