post 12.14 upgrades #1215
post 12.14 upgrades #1215
Conversation
omnibus/Gemfile
Outdated
| @@ -13,7 +13,7 @@ end | |||
| group :omnibus do | |||
| gem 'omnibus', git: 'https://github.com/chef/omnibus' | |||
| gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software' | |||
| gem 'license_scout', git: 'https://github.com/chef/license_scout' | |||
| gem 'license_scout', git: 'https://github.com/chef/license_scout', branch: "mp/yum-epl-and-compat-resource-license" | |||
omnibus/config/software/oc_id.rb
Outdated
| @@ -21,6 +21,7 @@ | |||
| license "Apache-2.0" | |||
| license_file "LICENSE" | |||
|
|
|||
| dependency "nokogiri" # for | |||
There was a problem hiding this comment.
I see you tried to put a comment to explain why we are adding this. Is this part and intent to fix the build process?
There was a problem hiding this comment.
I also think adding nokogiri here means we'll probably end up with two versions of it? Since it's getting installed in the bundle install with the bundle-defined version, and the software definition has another version (latest on rubygems?).
On the other hand, copying those here might be more ugly than just installing nokogiri twice 🤔
marcparadise
force-pushed
the
mp/post-12.14-upgrades
branch
from
73ea9a8 to
9835783
Compare
| license :project_license | ||
|
|
||
| # global | ||
| dependency "libiconv" |
There was a problem hiding this comment.
This makes me a bit nervous as I feel like this means we have under-specified software definitions here. Perhaps a comment about why this is at the top level?
|
I take it mover doesn't need to depsolve anything, so the depsolver bits that got dragged over from erchef when mover was created got nuked? The two omnibus software definition related comments aside, let's get this (maybe squashed and) merged. 👍 |
marcparadise
force-pushed
the
mp/post-12.14-upgrades
branch
from
6044f0e to
009031a
Compare
Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Marc A. Paradise <[email protected]>
* remove berks dep on yum and apt, no longer required. * update Gemfile.lock, Berksfile.lock Signed-off-by: Marc A. Paradise <[email protected]>
This dependency is no longe rpulled in implicitly, but it's absence was causing s390 builds to fail because libpopt appeared to depend on it. It was previously getting pulled in by libxml2 which was building first; with recent omnibus software updates it was no longer doing so. A better fix may be to conditionally include the dependency for s390x builds. Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Marc A. Paradise <[email protected]>
Signed-off-by: Steven Danna <[email protected]>
marcparadise
force-pushed
the
mp/post-12.14-upgrades
branch
from
009031a to
24bc77c
Compare
stevendanna
changed the title
This PR does the following: