New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dev-ruby/facter: ebuild cleanup #9339
Conversation
Cleanup: - do not use ${S} set by ruby-ng.eclass - correctly generate facter.rb, FACTERDIR environment variable is no longer required - remove no longer needed environment file - remove no longer needed multilib magic Bug: https://bugs.gentoo.org/601746
Pull Request assignment Areas affected: ebuilds dev-ruby/facter: @prometheanfire, @gentoo/sysadmin, @gentoo/ruby Bugs linked: 601746 In order to force reassignment and/or bug reference scan, please append |
Pull request CI report Report generated at: 2018-07-24 23:55 UTC No issues found |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll need to test this (or better yet have @graaff check it since I use puppet-agent).
ruby-ng_pkg_setup | ||
} | ||
|
||
src_unpack() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't this section the default already?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to avoid ruby-ng_src_unpack()
# restore ${S} and override all phases exported by ruby-ng.eclass | ||
S="${WORKDIR}/${P}" | ||
|
||
pkg_setup() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ruby isn't actually needed for this package to work, so no need to run it's pkg_setup
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This package already depends on ruby via ruby-ng.eclass (RUBY_OPTIONAL != yes). It can be made optional, but this should be done via use flag. Otherwise we can't properly install facter.rb for all ruby targets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ya, should probably be made optional then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't expect me to do that in this PR as it probably require changes in reverse deps (app-admin/puppet). :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, but you can do multiple commits in a PR, but that's up to you :P
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, build system does not allow to disable ruby support. So this needs either additional hacks in the ebuild or patches for build system.
local mycmakeargs=( | ||
-DCMAKE_VERBOSE_MAKEFILE=ON | ||
-DCMAKE_BUILD_TYPE=None |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why'd you get rid of the build type? and install prefix? and blkid location?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CMAKE_BUILD_TYPE and CMAKE_INSTALL_PREFIX are passed by cmake-utils.eclass. Do we really need to override them? BLKID_LIBRARY is not used by build system for a long time:
puppetlabs/facter@364b947#diff-dd2044c7974dda8071b268f0652e866e
No comments from the ruby team. |
Cleanup:
longer required
Bug: https://bugs.gentoo.org/601746