(maint) Allow for multiple augeas versions #7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
caseywilliams
commented
Feb 20, 2018
|
|
||
| if platform.is_sles? && platform.os_version == '10' | ||
| pkg.apply_patch 'resources/patches/augeas/augeas-1.2.0-fix-services-sles10.patch' |
There was a problem hiding this comment.
SLES 10 is no longer supported in puppet-agent, and pdk doesn't need it
There was a problem hiding this comment.
can you move this into a separate commit?
SLES 10 is no longer a supported puppet-agent platform, and pdk doesn't support it either.
Allows for a choice between augeas 1.4.0, 1.8.1, or 1.10.1 based on an :augeas_version project setting. 1.8.1 is kept as the default. Ports several patches over from puppet-agent for versions 1.4.0 and 1.10.1.
caseywilliams
force-pushed
the
augeas-update
branch
from
f1fde52 to
c137603
Compare
|
Seems reasonable. 👍 |
ekinanp
approved these changes
Mar 6, 2018
underscorgan
approved these changes
Mar 7, 2018
|
@underscorgan yep, ready for merge |
witjoh
pushed a commit
to witjoh/puppet-runtime
that referenced
this pull request
Feb 24, 2021
(SDK-213) Add custom rbconfig stuff from puppet-agent for Windows.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branches of puppet-agent now variously use three different versions of augeas - 1.4.0, 1.8.1, and 1.10.1. This PR adds support for all three versions (pdk uses version 1.8.1, which is currently the only version of augeas available in puppet-runtime).
Augeas presents a bit of a problem in terms of how to handle multiple possible versions;
ruby-augeasdepends on having some version of augeas, but it doesn't matter which one. Attempting to successfully include abuild_requires 'augeas'line in theruby-augeascomponent thus becomes tricky when there are multiple possible augeas versions. If we added separate, version-specific augeas components (e.g.augeas-1.4.0.rb), it seems like we'd need to either:build_requiresinruby-augeas.Neither of these sound great. I decided to do this:
:augeas_versionsetting in the projects that need augeas (i.e. all of them)augeas.rbcomponent, which looks to the:augeas_versionsetting for a version if available; If none is supplied, it uses 1.8.1 by default.ruby-augeascan continue tobuild_requiresthis without having to care about the version.Here are a few example builds for 1.10.x, 5.3.x, and master.
If this seems okay, I may refactor a few other components along these lines (e.g. ruby-stomp) to reduce the number of version-specific
component-x.y.z.rbcomponents (and so that people only have to figure out one approach to version selection while they're trying to work on puppet-runtime). If there's some other, cleaner way to accomplish this with vanagon or a different approach someone can think of, that would also be great to hear about.