summaryrefslogtreecommitdiff
path: root/omnibus/config
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-06-04 11:32:59 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-06-04 11:32:59 -0700
commit9e4addc7274ebd32aa4ebc3cad4a7932b26c8325 (patch)
tree58498b1ea266d1b475ded1df8a0fac94b0ab45a0 /omnibus/config
parent689c581bb4a12ee9ee216c354aec5efc82455613 (diff)
downloadchef-9e4addc7274ebd32aa4ebc3cad4a7932b26c8325.tar.gz
Use inspec-core, new ffi gem, and bump depslcg/inspec-core-ffi-and-bump
Switches to inspec-core, bumps ffi gem to newest release and bumps other deps. closes #7236 Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'omnibus/config')
-rw-r--r--omnibus/config/projects/chef.rb7
-rw-r--r--omnibus/config/software/unf_ext.rb23
2 files changed, 1 insertions, 29 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 10032b44a4..117dcec94c 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -1,5 +1,5 @@
#
-# Copyright 2012-2017, Chef Software Inc.
+# Copyright 2012-2018, Chef Software Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -47,11 +47,6 @@ 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
deleted file mode 100644
index 269fa933b7..0000000000
--- a/omnibus/config/software/unf_ext.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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