summaryrefslogtreecommitdiff
path: root/omnibus/config/projects/chef.rb
diff options
context:
space:
mode:
Diffstat (limited to 'omnibus/config/projects/chef.rb')
-rw-r--r--omnibus/config/projects/chef.rb26
1 files changed, 3 insertions, 23 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 217170ffef..2cb807f887 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -45,28 +45,8 @@ override :chef, version: "local_source"
overrides_path = File.expand_path("../../../../omnibus_overrides.rb", current_file)
instance_eval(IO.read(overrides_path), overrides_path)
-dependency "preparation"
+dependency "chef-local-source"
-dependency "chef"
-
-#
-# addons which require omnibus software defns (not direct deps of chef itself - RFC-063)
-#
-dependency "nokogiri" # (nokogiri cannot go in the Gemfile, see wall of text in the software defn)
-
-# FIXME?: might make sense to move dependencies below into the omnibus-software chef
-# definition or into a chef-complete definition added to omnibus-software.
-dependency "gem-permissions"
-dependency "shebang-cleanup"
-dependency "version-manifest"
-dependency "openssl-customization"
-
-# devkit needs to come dead last these days so we do not use it to compile any gems
-dependency "ruby-msys2-devkit" if windows?
-
-dependency "ruby-cleanup"
-
-# further gem cleanup other projects might not yet want to use
dependency "more-ruby-cleanup"
package :rpm do
@@ -94,7 +74,7 @@ package :msi do
upgrade_code msi_upgrade_code
wix_candle_extension "WixUtilExtension"
wix_light_extension "WixUtilExtension"
- signing_identity "13B510D1CF1B3467856A064F1BEA12D0884D2528", machine_store: true
+ signing_identity ENV.fetch("OMNIBUS_SIGNING_IDENTITY", "13B510D1CF1B3467856A064F1BEA12D0884D2528"), machine_store: true
parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-x64-mingw-ucrt/ext/win32-eventlog/chef-log.dll")),
ProjectLocationDir: project_location_dir
end
@@ -104,4 +84,4 @@ package :appx do
skip_packager true
end
-runtime_dependency "coreutils" if rhel?
+runtime_dependency "coreutils" if rhel? \ No newline at end of file