omnibus: Use jre-from-jdk on armhf for solr4

Signed-off-by: Julien 'Lta' BALLET <[email protected]>
chef · Oct 28, 2016 · e0b7ae6 · e0b7ae6
1 parent 83572d1
commit e0b7ae6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: e72cafb03e6a7ee38f78dfda9feb9d683c60901a
+  revision: f1aa0f05e01438f3d6e3bc73f6fe60f105d466db
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -34,12 +34,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    aws-sdk (2.6.13)
-      aws-sdk-resources (= 2.6.13)
-    aws-sdk-core (2.6.13)
+    aws-sdk (2.6.14)
+      aws-sdk-resources (= 2.6.14)
+    aws-sdk-core (2.6.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.13)
-      aws-sdk-core (= 2.6.13)
+    aws-sdk-resources (2.6.14)
+      aws-sdk-core (= 2.6.14)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)

diff --git a/omnibus/config/software/opscode-solr4.rb b/omnibus/config/software/opscode-solr4.rb
@@ -28,6 +28,8 @@
   dependency "ibm-jre"
 elsif intel? && _64_bit?
   dependency "server-jre"
+elsif armhf?
+  dependency "jre-from-jdk"
 else
   raise "A JRE is required by opscode-solr4, but none are known for this platform"
 end