diff options
| author | Ryan Hass <rhass@users.noreply.github.com> | 2016-09-08 14:33:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 14:33:26 -0700 |
| commit | cc3534025d105861c412490cb60bc7a754fb6d66 (patch) | |
| tree | a85d968509f6c1e8ee7fbc26be6008ff553c62d0 | |
| parent | 974bc5d47a5347ee39e993aaa9b9f4dcbed6aece (diff) | |
| parent | 8dab87830198a0aab2d36f7ef4a426380f495d48 (diff) | |
| download | chef-cc3534025d105861c412490cb60bc7a754fb6d66.tar.gz | |
Merge pull request #5264 from chef/rhass/COOL-502
Only support Solaris 10u11 and newer
| -rw-r--r-- | omnibus/Gemfile | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus/files/mapfiles/solaris | 18 |
3 files changed, 3 insertions, 21 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 2f2df4126f..aae6a0e9c0 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "omnibus", github: "chef/omnibus", branch: "sersut/ff-ksubrama/gcc_investigate" +gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate" gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby23" gem "license_scout", github: "chef/license_scout" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a8ea4f1ad3..d6d5c48245 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -17,8 +17,8 @@ GIT GIT remote: git://github.com/chef/omnibus.git - revision: 96d4695285c9530ff3b6b8160bc46e3ac6b19dd0 - branch: sersut/ff-ksubrama/gcc_investigate + revision: 98c9af20a0f79b6ac205613f509b4725eea47f7b + branch: rhass/COOL-502_with_gcc_investigate specs: omnibus (5.5.0) aws-sdk (~> 2) diff --git a/omnibus/files/mapfiles/solaris b/omnibus/files/mapfiles/solaris deleted file mode 100644 index c0ca5c1ae3..0000000000 --- a/omnibus/files/mapfiles/solaris +++ /dev/null @@ -1,18 +0,0 @@ -$mapfile_version 2 -DEPEND_VERSIONS libnsl.so { - ALLOW = SUNW_1.1; - ALLOW = SUNWprivate_1.1; -}; -DEPEND_VERSIONS libsocket.so { - ALLOW = SUNW_1.4; - ALLOW = SUNWprivate_1.1; -}; -DEPEND_VERSIONS libdl.so { - ALLOW = SUNW_1.4; - ALLOW = SUNWprivate_1.1; -}; -DEPEND_VERSIONS libc.so { - ALLOW = SUNW_1.22.1; - ALLOW = SUNW_1.4; - ALLOW = SUNWprivate_1.1; -}; |