Skip to content
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

[skip-ci] RPM: cleanup macro defs #24864

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Dec 18, 2024

The default gobuild macro on CentOS Stream 9 now includes support for BUILDTAGS.

CentOS Stream envs now also define _user_tmpfilesdir macro by default.

Both these definitions are no longer needed here.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 18, 2024
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, lsm5

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

A friendly reminder that this PR had no activity for 30 days.

The default `gobuild` macro on CentOS Stream 9 now includes support for
`BUILDTAGS`.

CentOS Stream envs now also define `_user_tmpfilesdir` macro by default.
Both these definitions are no longer needed here.

`libtrust_openssl` buildtag is also set in spec wherever relevant.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the rpm-macro-cleanup branch from e144b87 to 76d234a Compare February 4, 2025 11:05
@lsm5
Copy link
Member Author

lsm5 commented Feb 4, 2025

/packit build
/packit test

@lsm5 lsm5 marked this pull request as ready for review February 4, 2025 11:40
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 4, 2025
@lsm5
Copy link
Member Author

lsm5 commented Feb 4, 2025

@containers/podman-maintainers PTAL

@lsm5
Copy link
Member Author

lsm5 commented Feb 4, 2025

@jnovy PTAL

@jnovy
Copy link
Contributor

jnovy commented Feb 4, 2025

For libtrust_openssl I wouldn't add any special (fips) conditioning - just put it into %if %{defined rhel} section? What do you think? @lsm5

Comment on lines +22 to +24
%if %{defined rhel}
%define fips 1
%endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if fips is a good condition name, fips can be enabled on fedora as well.

AFAICT the build tag is calling some special code only in the rhel go builds? At least it doe snot compile on fedora with that tag. So I guess just using rhel as condition seems best.
But overall it would likely be great to have some actual docs on what that tag does and why rhel needs it, I guess some specific crypto policy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The question here is if we need libtrust_openssl in Fedora and CentOS too - by default?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well it doesn't build on fedora so the answer is we cannot use it on fedora.
And I guess the rhel macro also applies to centos by default?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, centos and rhel macros are defined in CentOS, in RHEL only rhel

@github-actions github-actions bot removed the stale-pr label Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants