summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-02-17 14:54:35 -0800
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-02-23 16:36:32 -0500
commitf03e53d50d1662866e547363faf7689cca9b4019 (patch)
tree79b3c564c171a349a348427f91386febfa195bd8 /omnibus
parentaa7e0e05395823c66b30f1a810d1720aea3b6d72 (diff)
downloadchef-f03e53d50d1662866e547363faf7689cca9b4019.tar.gz
Build ruby from source on all platforms.
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/config/projects/chef-fips.rb11
-rw-r--r--omnibus/config/projects/chef.rb17
2 files changed, 14 insertions, 14 deletions
diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb
index c91dbc4b89..dfe1a9e13a 100644
--- a/omnibus/config/projects/chef-fips.rb
+++ b/omnibus/config/projects/chef-fips.rb
@@ -34,16 +34,7 @@ else
install_dir "#{default_root}/#{name}"
end
-# 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"
# Global FIPS override flag.
override :fips, enabled: true
@@ -51,8 +42,6 @@ override :fips, enabled: true
override :chef, version: "local_source"
override :ohai, version: "master"
-dependency "rb-readline"
-
msi_upgrade_code = "819F5DB3-B818-4358-BB2B-54B8171D0A26"
project_location_dir = "chef-fips"
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 5926538bb8..2e003322f8 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -35,7 +35,7 @@ else
end
if windows?
- override :'ruby-windows', version: "2.0.0-p645"
+ override :ruby, version: "2.0.0-p645"
# Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want
# to unnecessarily make the client any fatter.
if windows_arch_i386?
@@ -52,14 +52,25 @@ override :rubygems, version: "2.5.2"
override :chef, version: "local_source"
override :ohai, version: "master"
+# Global FIPS override flag.
+if windows? || rhel?
+ override :fips, enabled: true
+end
+
dependency "preparation"
-dependency "chef"
-dependency "pry"
+dependency "rb-readline" if windows?
dependency "nokogiri"
+dependency "pry"
+dependency "chef"
dependency "shebang-cleanup"
dependency "version-manifest"
dependency "openssl-customization"
+if windows?
+ dependency "ruby-windows-devkit"
+ dependency "ruby-windows-devkit-bash"
+end
+
package :rpm do
signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"]
end