Repository: bigtop Updated Branches: refs/heads/BIGTOP-2979 [created] 7007c0265
BIGTOP-2979: JAVA_HOME inconsistent on non-x86 architectures Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7007c026 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7007c026 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7007c026 Branch: refs/heads/BIGTOP-2979 Commit: 7007c026540d099ee32ec194163b3e4115540366 Parents: 155a296 Author: Olaf Flebbe <[email protected]> Authored: Mon Jan 1 19:18:07 2018 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Mon Jan 1 19:18:07 2018 +0100 ---------------------------------------------------------------------- bigtop_toolchain/manifests/env.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/7007c026/bigtop_toolchain/manifests/env.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp index f842ed4..2c336df 100644 --- a/bigtop_toolchain/manifests/env.pp +++ b/bigtop_toolchain/manifests/env.pp @@ -29,10 +29,7 @@ class bigtop_toolchain::env { $javahome = "/usr/lib/jvm/${java}-openjdk-$arch" } 'Fedora','Centos', 'Amazon': { - case $architecture { - 'amd64','x86_64' : { $javahome = "/usr/lib/jvm/${java}" } - 'ppc64le' : { $javahome = "/usr/lib/jvm/${java}-openjdk" } - } + $javahome = "/usr/lib/jvm/${java}" } 'OpenSuSE' : { $javahome = "/usr/lib64/jvm/${java}-openjdk-${java_version}"
