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


BIGTOP-2832. Toolchain failed to install on Debian 8


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

Branch: refs/heads/branch-1.2
Commit: b3bd55846914a6a5d4ceae02c1c7f51904f99246
Parents: acce540
Author: Evans Ye <[email protected]>
Authored: Wed Jul 5 14:42:54 2017 +0800
Committer: Evans Ye <[email protected]>
Committed: Thu Jul 6 23:21:33 2017 +0800

----------------------------------------------------------------------
 bigtop_toolchain/manifests/jdk.pp      | 17 ++++++++++++++++-
 bigtop_toolchain/manifests/packages.pp |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b3bd5584/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp 
b/bigtop_toolchain/manifests/jdk.pp
index 8c1518b..4e15eb1 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -17,8 +17,23 @@ class bigtop_toolchain::jdk {
   case $::operatingsystem {
     /Debian/: {
       require apt
-      unless $os[release][major] > "8" {
+      unless $operatingsystemmajrelease > "8" {
+         # we pin openjdk-8-* and ca-certificates-java to backports
          require apt::backports
+
+         apt::pin { 'backports_jdk':
+            packages => 'openjdk-8-*',
+            priority => 500,
+            release  => 'jessie-backports',
+         } ->
+         apt::pin { 'backports_ca':
+            packages => 'ca-certificates-java',
+            priority => 500,
+            release  => 'jessie-backports',
+         } ->
+         exec {'own_update':
+            command => '/usr/bin/apt-get update'
+         } -> Package['openjdk-8-jdk']
       }
 
       package { 'openjdk-8-jdk' :

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b3bd5584/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp 
b/bigtop_toolchain/manifests/packages.pp
index 6101e35..7a15d3b 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -159,7 +159,7 @@ class bigtop_toolchain::packages {
     ] }
     /(Ubuntu|Debian)/: {
       # Debian-9 is using mariadb instead of mysql
-      if ($operatingsystem == "Debian") and ($os[release][major] > "8") {
+      if ($operatingsystem == "Debian") and ($operatingsystemmajrelease > "8") 
{
         $mysql_dev="libmariadb-dev"
       } else {
         $mysql_dev="libmysqlclient-dev"

Reply via email to