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

[master] rpm: remove CentOS/RHEL 7 leftovers #1040

Merged
merged 2 commits into from
Jul 24, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 20, 2024

Relates to:

rpm: remove conditional weak-dependencies for CentOS/RHEL 7

These conditionals were added in incfee3a64519ec5361b406eb6439aed7e3768b7c2
and bb4bd31, because weak dependencies were
introduced in CentOS/RHEL 8 and higher (see 1, 2), but not yet available
in CentOS/RHEL 7.

Now that CentOS/RHEL 7 and 8 reached EOL and removed from our packaging
(in 88a6cdc, 67c89e9),
all supported RPM distros now support weak dependencies, so we can remove
the conditionals.

rpm: remove RLIMIT_NOFILE patch for EL 7 systems

Now that CentOS/RHEL 7 and 8 reached EOL and removed from our packaging
(in 88a6cdc, 67c89e9),
we can remove the patch.

RLIMIT_NOFILE defaults to an unusable value on EL 7 systems, but more
modern systems have sane defaults. As such, patch the systemd unit only
on EL 7 systems to ensure correct behaviour.

This reverts commit 4e7a147.

@thaJeztah thaJeztah self-assigned this Jul 20, 2024
@thaJeztah thaJeztah changed the title [master] rpm: remove CentOS/RHEL 7, 8 leftovers [master] rpm: remove CentOS/RHEL 7 leftovers Jul 20, 2024
@thaJeztah
Copy link
Member Author

rpm: remove libcgroup dependency (for CentOS/RHEL 7, 8)

We still need to support RHEL 8, so I need to drop this one

These conditionals were added in incfee3a64519ec5361b406eb6439aed7e3768b7c2
and bb4bd31, because weak dependencies were
introduced in CentOS/RHEL 8 and higher (see [1], [2]), but not yet available
in CentOS/RHEL 7.

Now that CentOS/RHEL 7 reached EOL and removed from our packaging
(in 88a6cdc, 67c89e9),
all supported RPM distros now support weak dependencies, so we can remove
the conditionals.

[1]: https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/packaging_and_distributing_software/new-features-in-rhel-8_packaging-and-distributing-software#support-for-weak-dependencies_new-features-in-rhel-8
[2]: https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/packaging_and_distributing_software/new-features-in-rhel-8_packaging-and-distributing-software#boolean-dependencies-syntax

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Now that CentOS/RHEL 7 and 8 reached EOL and removed from our packaging
(in 88a6cdc, 67c89e9),
we can remove the patch.

> RLIMIT_NOFILE defaults to an unusable value on EL 7 systems, but more
> modern systems have sane defaults. As such, patch the systemd unit only
> on EL 7 systems to ensure correct behaviour.

This reverts commit 4e7a147.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the remove_rhel7_rhel8_remnants branch from df15be2 to 57e2252 Compare July 20, 2024 17:19
@thaJeztah thaJeztah requested a review from vvoland July 23, 2024 22:46
@thaJeztah thaJeztah merged commit 8f6aa30 into docker:master Jul 24, 2024
7 checks passed
@thaJeztah thaJeztah deleted the remove_rhel7_rhel8_remnants branch July 24, 2024 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants