Modernize RPM spec file templates #533
Merged
Conversation
This file contains 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
20 tasks
nuclearsandwich
approved these changes
Jul 9, 2019
|
@richmattes, would you mind taking a look at these changes? We'll use very similar templates for the ROS 2 packages for RHEL and Fedora (though this review includes only updates to the ROS 1 templates). |
|
Sure. I'm busy this week but I'll take a look this weekend.
…On Tue, Jul 9, 2019, 1:16 PM Scott K Logan ***@***.***> wrote:
@richmattes <https://github.com/richmattes>, would you mind taking a look
at these changes? We'll use very similar templates for the ROS 2 packages
for RHEL and Fedora (though this review includes only updates to the ROS 1
templates).
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#533?email_source=notifications&email_token=AACJWLG2RSNGKTNWDV72URTP6TBW3A5CNFSM4HHTUI3KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODZQ5WFQ#issuecomment-509729558>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AACJWLADGWS62DYNKRISTU3P6TBW3ANCNFSM4HHTUI3A>
.
|
|
I took a look at the changes, they all look reasonable to me. |
|
Thanks for taking a look, @richmattes and @nuclearsandwich. I'm going to clean up the line breaks in the commit messages and merge this since it won't conflict with the ongoing generator refactor. |
Neither Fedora or RHEL 7+ use this value. If another distribution were to be supported for RPM generation in Bloom that can take advantage of this value, we should find a better way to add it instead of hard- coding it into the template. Signed-off-by: Scott K Logan <logans@cottsay.net>
Supported in RPM 4.11 and newer: https://rpm.org/user_doc/autosetup.html Signed-off-by: Scott K Logan <logans@cottsay.net>
...rather than assuming that the make executable is 'make'. Signed-off-by: Scott K Logan <logans@cottsay.net>
Also move terminating '..' to the end to make it easier to patch cmake arguments and less likely that the make arguments accidentally get added to the end of the cmake arguments. Signed-off-by: Scott K Logan <logans@cottsay.net>
There are two classes of issues here: 1. ROS packages often provide libraries which are also provided by the operating system. If an operating system declares a dependency on that library, we don't want the package manager to install the ROS package instead of the system package. 2. Many ROS packages don't install libraries in a way that the 'provides' portion of dependency generation can detect, so when another ROS package takes a dependency on that library, the automatic dependency can't be met and the downstream package cannot be installed. More info on RPM dependency generation: https://rpm.org/user_doc/dependency_generators.html Signed-off-by: Scott K Logan <logans@cottsay.net>
The BRP Python bytecompiler will always use the sytem's default Python interpreter, which may not be the interpreter we're targeting. Safest option is to disable the automagic byte compilation altogether. Note that this doesn't mean that python files won't ever be compiled, it just means that the catch-all policy at the end of the process won't attempt to compile anything which hasn't already been compiled. Signed-off-by: Scott K Logan <logans@cottsay.net>
This change shouldn't modify the behavior in Fedora, where all current releases define 'cmake3' to be the same as 'cmake'. In RHEL 7, where cmake 2 is the default, we need to use the 'cmake3' macro to use the supplamental 'cmake3' executable instead of the system default. All current ROS releases except Indigo have a *minimum* cmake requirement of 3. Signed-off-by: Scott K Logan <logans@cottsay.net>
cottsay
changed the title
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.
Each commit message contains justification for the change.