diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-02-04 21:36:51 -0500 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-02-04 21:37:12 -0500 |
| commit | a655b753400d5925d749fec36413a51ceead523c (patch) | |
| tree | b3560f86934a0d64efc292b6b80edc256d404be5 | |
| parent | d037e0d80699989dfe218b6bb12c8e68cc64459a (diff) | |
| download | chef-a655b753400d5925d749fec36413a51ceead523c.tar.gz | |
Transport current_file fix to angrychef. Commnts for chef-fips
| -rw-r--r-- | omnibus/config/projects/angrychef.rb | 1 | ||||
| -rw-r--r-- | omnibus/config/projects/chef-fips.rb | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/omnibus/config/projects/angrychef.rb b/omnibus/config/projects/angrychef.rb index f1e578fdc1..48902e6607 100644 --- a/omnibus/config/projects/angrychef.rb +++ b/omnibus/config/projects/angrychef.rb @@ -19,6 +19,7 @@ # test machines. As such this project definition is just a thin wrapper around # `config/project/chef.rb`. # +current_file = __FILE__ chef_project_contents = IO.read(File.expand_path("../chef.rb", __FILE__)) self.instance_eval chef_project_contents diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb index d8c6c79c91..c91dbc4b89 100644 --- a/omnibus/config/projects/chef-fips.rb +++ b/omnibus/config/projects/chef-fips.rb @@ -16,7 +16,6 @@ # # This is the chef client build with FIPS mode enabled. -# It's a stub for now and produces identical results # current_file = __FILE__ chef_project_contents = IO.read(File.expand_path("../chef.rb", current_file)) @@ -35,7 +34,14 @@ else install_dir "#{default_root}/#{name}" end -# Try a newer bundler to improve build speed. +# Even if chef marches ahead, make sure that we stay pinned to 1.10.6 +# bundler 1.11 introduces some new features that require zlib. The zlib1.dll +# base address is generated by gcc to overlap that of libeay.dll. This will +# force windows into relocating libeay, freaking out the FIPS integrity +# verifier. Lol security indeed. +# Delete this once all dlls we generate are appropriately relocated. +override :bundler, version: "1.10.6" + override :ruby, version: "2.1.7" override :"rb-readline", version: "v0.5.3" |