diff options
| author | Ryan Hass <rhass@users.noreply.github.com> | 2017-01-17 18:13:45 -0800 |
|---|---|---|
| committer | Ryan Hass <rhass@users.noreply.github.com> | 2017-01-18 20:16:01 -0800 |
| commit | b1669f61f29e955099aeb11ac31d875d67843233 (patch) | |
| tree | efdb0ce99c0d3dec2bde4ba6e8fde72d25715ada /omnibus/config/software | |
| parent | d04aaf2b62a531274cd02ed2514e9692f843f8a2 (diff) | |
| download | chef-b1669f61f29e955099aeb11ac31d875d67843233.tar.gz | |
Add gems for ECC algorithm support to omnibus.
These definitions have been added to resolve build issues with ECC
algorithm support on Solaris and Cisco IOS-XR.
The bcyrpt_pbkdf gem currently link against shared libs which are not
installed on Cisco IOS-XR.
The rbnacl gems currently fail to compile on Solaris for both x86-64 and
SPARC.
Adding these definitions will allow us to selectively define the
supported platforms as well as provide a simple means to itterate on
patches as needed.
Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
Diffstat (limited to 'omnibus/config/software')
| -rw-r--r-- | omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb | 10 | ||||
| -rw-r--r-- | omnibus/config/software/chef-gem-rbnacl-libsodium.rb | 10 | ||||
| -rw-r--r-- | omnibus/config/software/chef.rb | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb b/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb new file mode 100644 index 0000000000..1f7f4d3207 --- /dev/null +++ b/omnibus/config/software/chef-gem-bcrypt_pbkdf-ruby.rb @@ -0,0 +1,10 @@ +# gem installs this gem from the version specified in chef's Gemfile.lock +# so we can take advantage of omnibus's caching. Just duplicate this file and +# add the new software def to chef software def if you want to separate +# another gem's installation. +require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def" +BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__) + +license "MIT" +license_file "https://raw.githubusercontent.com/mfazekas/bcrypt_pbkdf-ruby/master/COPYING" +skip_transitive_dependency_licensing true diff --git a/omnibus/config/software/chef-gem-rbnacl-libsodium.rb b/omnibus/config/software/chef-gem-rbnacl-libsodium.rb new file mode 100644 index 0000000000..90bbc69dfb --- /dev/null +++ b/omnibus/config/software/chef-gem-rbnacl-libsodium.rb @@ -0,0 +1,10 @@ +# gem installs this gem from the version specified in chef's Gemfile.lock +# so we can take advantage of omnibus's caching. Just duplicate this file and +# add the new software def to chef software def if you want to separate +# another gem's installation. +require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def" +BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__) + +license "MIT" +license_file "https://raw.githubusercontent.com/cryptosphere/rbnacl-libsodium/master/LICENSE" +skip_transitive_dependency_licensing true diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb index c6ced7e566..22bbc7508a 100644 --- a/omnibus/config/software/chef.rb +++ b/omnibus/config/software/chef.rb @@ -44,6 +44,9 @@ 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? + # Now everyone else, in alphabetical order because we don't care THAT much Dir.entries(File.dirname(__FILE__)).sort.each do |gem_software| |