diff options
| author | Tim Smith <tsmith@chef.io> | 2018-03-26 18:43:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 18:43:07 -0700 |
| commit | 9c0b576af2803ffcec616d031594c40643d81749 (patch) | |
| tree | 9e71d8f3789298cdde1eeb12665770d6e4a0f667 /omnibus | |
| parent | c66045a875b4341bd1923ff869e01a6299701a28 (diff) | |
| parent | 07a2873d37ea90bb6aa0b6c99f5d522e4ee4748d (diff) | |
| download | chef-9c0b576af2803ffcec616d031594c40643d81749.tar.gz | |
Merge pull request #7051 from chef/tm/inspec_2
Ship InSpec 2
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 6 | ||||
| -rw-r--r-- | omnibus/config/software/unf_ext.rb | 23 |
2 files changed, 29 insertions, 0 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index f758893cbb..10032b44a4 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -46,6 +46,12 @@ overrides_path = File.expand_path("../../../../omnibus_overrides.rb", current_fi instance_eval(IO.read(overrides_path), overrides_path) dependency "preparation" + +# InSpec 2 depends on unf_ext, which doesn't currently build on solaris on aix. There exists a fork +# of unf_ext which fixes this, so let's use that in Chef for now. +# FIXME: must remove this ASAP. +dependency "unf_ext" + dependency "chef" # diff --git a/omnibus/config/software/unf_ext.rb b/omnibus/config/software/unf_ext.rb new file mode 100644 index 0000000000..269fa933b7 --- /dev/null +++ b/omnibus/config/software/unf_ext.rb @@ -0,0 +1,23 @@ +# encoding: utf-8 +# override for unf_ext until +# https://github.com/knu/ruby-unf_ext/pull/39 +# is merged and released + +name "unf_ext" + +dependency "ruby" +dependency "rubygems" +dependency "bundler" +dependency "appbundler" + +license :project_license +default_version "c0b3bd922214a172976f6f368c0b4e4fbf91ed78" +source git: "https://github.com/jquick/ruby-unf_ext.git" +skip_transitive_dependency_licensing true + +build do + env = with_standard_compiler_flags(with_embedded_path) + delete "#{name}-*.gem" + gem "build #{name}.gemspec", env: env + gem "install #{name}-*.gem --no-document", env: env +end |