diff options
| author | Tom Duffield <tom@chef.io> | 2017-01-19 10:03:21 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-01-19 10:03:21 -0600 |
| commit | af9be8fabd1851fcacc6c29c55ac23f2e4f3d46b (patch) | |
| tree | c08467004e7b877198a1e2c2461bfbf1f035cc2c /omnibus | |
| parent | 3d1ca79eaf36c5721531ebc5a7df4d250bd206ba (diff) | |
| download | chef-af9be8fabd1851fcacc6c29c55ac23f2e4f3d46b.tar.gz | |
Clarify platform constraints for ios and solaris
Based on feedback.
Signed-off-by: Tom Duffield <tom@chef.io>
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
| -rw-r--r-- | omnibus/config/software/chef.rb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4e0c7ce66f..9e430e6afc 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/license_scout.git - revision: b8163fac517b46b4cb043cbee5ef21caa99b80e4 + revision: 4bf6f5cf21bc0ff8de327dfc0a245b625134d6b0 specs: license_scout (0.1.2) ffi-yajl (~> 2.2) @@ -8,8 +8,8 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git - revision: edf1b47fd065fa1185610185d2f0271e83ca3e99 - branch: rhass/COOL-657_ecc-algorithm-support + revision: f4b1c0f2682907967d10c64850f9c607070697dd + branch: shain/ruby_windows_monster specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -124,7 +124,7 @@ GEM multi_json (~> 1.10) method_source (0.8.2) minitar (0.5.4) - mixlib-archive (0.2.0) + mixlib-archive (0.3.0) mixlib-log mixlib-authentication (1.4.1) mixlib-log diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb index 06e163ac32..c53a2339ae 100644 --- a/omnibus/config/software/chef.rb +++ b/omnibus/config/software/chef.rb @@ -44,8 +44,10 @@ dependency "chef-gem-ruby-prof" dependency "chef-gem-byebug" dependency "chef-gem-debug_inspector" dependency "chef-gem-binding_of_caller" -dependency "chef-gem-rbnacl-libsodium" unless ios_xr? -dependency "chef-gem-bcrypt_pbkdf-ruby" unless solaris? +unless ios_xr? || solaris? + dependency "chef-gem-rbnacl-libsodium" + dependency "chef-gem-bcrypt_pbkdf-ruby" +end # Now everyone else, in alphabetical order because we don't care THAT much Dir.entries(File.dirname(__FILE__)).sort.each do |gem_software| |