From d87764c6c0be50ef7ad2e79ab26d8e2631d8e4e9 Mon Sep 17 00:00:00 2001 From: Blake Irvin Date: Mon, 27 Apr 2015 16:34:14 +0200 Subject: [PATCH 1/3] openjdk packages now in current smartos pkgsrc --- recipes/set_attributes_from_version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/set_attributes_from_version.rb b/recipes/set_attributes_from_version.rb index 8c6b2fa5..b49dd03b 100644 --- a/recipes/set_attributes_from_version.rb +++ b/recipes/set_attributes_from_version.rb @@ -44,7 +44,7 @@ node.default['java']['openjdk_packages'] = ["openjdk-#{node['java']['jdk_version']}-jdk", "openjdk-#{node['java']['jdk_version']}-jre-headless"] when "smartos" node.default['java']['java_home'] = "/opt/local/java/sun6" - node.default['java']['openjdk_packages'] = ["sun-jdk#{node['java']['jdk_version']}", "sun-jre#{node['java']['jdk_version']}"] + node.default['java']['openjdk_packages'] = ["openjdk#{node['java']['jdk_version']}", "sun-jdk#{node['java']['jdk_version']}"] when "windows" # Do nothing otherwise we will fall through to the else and set java_home to an invalid path, causing the installer to popup a dialog when "macosx" From 775494afe42d8dd5850fe437302c193673415c0e Mon Sep 17 00:00:00 2001 From: Blake Irvin Date: Mon, 27 Apr 2015 16:42:11 +0200 Subject: [PATCH 2/3] use openjdk package names/paths only --- recipes/set_attributes_from_version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/set_attributes_from_version.rb b/recipes/set_attributes_from_version.rb index b49dd03b..7925a223 100644 --- a/recipes/set_attributes_from_version.rb +++ b/recipes/set_attributes_from_version.rb @@ -43,8 +43,8 @@ end node.default['java']['openjdk_packages'] = ["openjdk-#{node['java']['jdk_version']}-jdk", "openjdk-#{node['java']['jdk_version']}-jre-headless"] when "smartos" - node.default['java']['java_home'] = "/opt/local/java/sun6" - node.default['java']['openjdk_packages'] = ["openjdk#{node['java']['jdk_version']}", "sun-jdk#{node['java']['jdk_version']}"] + node.default['java']['java_home'] = "/opt/local/java/openjdk#{node['java']['jdk_version']}" + node.default['java']['openjdk_packages'] = "openjdk#{node['java']['jdk_version']}" when "windows" # Do nothing otherwise we will fall through to the else and set java_home to an invalid path, causing the installer to popup a dialog when "macosx" From c501cbe912ca9fbd4182aab14db5491377ecfe46 Mon Sep 17 00:00:00 2001 From: Blake Irvin Date: Mon, 27 Apr 2015 18:56:18 +0200 Subject: [PATCH 3/3] provide smartos package in an array need this to satisfy .each behavior in recipe that uses these attributes --- recipes/set_attributes_from_version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/set_attributes_from_version.rb b/recipes/set_attributes_from_version.rb index 7925a223..9aa87619 100644 --- a/recipes/set_attributes_from_version.rb +++ b/recipes/set_attributes_from_version.rb @@ -44,7 +44,7 @@ node.default['java']['openjdk_packages'] = ["openjdk-#{node['java']['jdk_version']}-jdk", "openjdk-#{node['java']['jdk_version']}-jre-headless"] when "smartos" node.default['java']['java_home'] = "/opt/local/java/openjdk#{node['java']['jdk_version']}" - node.default['java']['openjdk_packages'] = "openjdk#{node['java']['jdk_version']}" + node.default['java']['openjdk_packages'] = ["openjdk#{node['java']['jdk_version']}"] when "windows" # Do nothing otherwise we will fall through to the else and set java_home to an invalid path, causing the installer to popup a dialog when "macosx"