Adding changes to use chef-foundation and skip transitive dependenciesjesseprieur/BS-141

Signed-off-by: Jesse Prieur <jesse.prieur@gmail.com>

2 files changed, 18 insertions, 16 deletions

diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 10f7f25b15..88f30f2a1e 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -45,27 +45,27 @@ 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 "preparation"
+dependency "chef-local-source"
 
-dependency "chef"
+# 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)
+# #
+# # 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"
+# # 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?
+# # 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"
+# dependency "ruby-cleanup"
 
 # further gem cleanup other projects might not yet want to use
 
diff --git a/omnibus/config/software/chef-local-source.rb b/omnibus/config/software/chef-local-source.rb
index 528354422d..591b33cdac 100644
--- a/omnibus/config/software/chef-local-source.rb
+++ b/omnibus/config/software/chef-local-source.rb
@@ -25,6 +25,8 @@ license_file "LICENSE"
 # So that Open4/deep_merge/diff-lcs disclaimers are present in Omnibus LICENSES tree.
 license_file "NOTICE"
 
+skip_transitive_dependency_licensing true
+
 # For the specific super-special version "local_source", build the source from
 # the local git checkout. This is what you'd want to occur by default if you
 # just ran omnibus build locally.