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.

Sign up for GitHub

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

Jump to bottom

Also build for CentOS 9. #283

Merged
merged 1 commit into from
May 4, 2022
Merged

Also build for CentOS 9. #283

merged 1 commit into from
May 4, 2022

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented May 4, 2022 •
edited
Loading

Changes;

  • do not "provide" runc on CentOS/RHEL >= 8
  • do not build btrfs on CentOS/RHEL >= 8
  • set the correct build-dependency for BTRFS on SUSE flavors and "others"

thaJeztah
thaJeztah commented May 4, 2022
View reviewed changes
rpm/containerd.spec Outdated Show resolved Hide resolved
thaJeztah
thaJeztah commented May 4, 2022
View reviewed changes
rpm/containerd.spec Outdated Show resolved Hide resolved
@thaJeztah thaJeztah force-pushed the carry_270_centos9 branch 7 times, most recently from 64ec306 to 3fa047d Compare May 4, 2022 16:16
@Romain-Geissler-1A @thaJeztah
Also build for CentOS 9.
7913b5b 
- do not "provide" runc on CentOS/RHEL >= 8
- do not build btrfs on CentOS/RHEL >= 8
- set the correct build-dependency for BTRFS on SUSE flavors and "others"

Signed-off-by: Romain Geissler <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah marked this pull request as ready for review May 4, 2022 16:49
@thaJeztah thaJeztah mentioned this pull request May 4, 2022
Closed
@thaJeztah
Copy link
Member Author

@ndeloof @tianon @rumpl PTAL; I think this one should be ready for review

@Romain-Geissler-1A
Copy link
Contributor

Hi,

For what it's worth, these changes look ok for me.

Cheers,
Romain

tianon
tianon approved these changes May 4, 2022
View reviewed changes
Copy link
Contributor

@tianon tianon left a comment

Choose a reason for hiding this comment

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

A bit over my head on RPM spec knowledge, but seems sane? 🙈

@thaJeztah
Copy link
Member Author

Hi,

For what it's worth, these changes look ok for me.

Cheers, Romain

Thank you, Romain!

A bit over my head on RPM spec knowledge, but seems sane?

They're a big pain, so don't blame you (took me several attempts to get it right with all the different distro combinations 😓)

@thaJeztah
Copy link
Member Author

Let me bring this one in 👍

@thaJeztah thaJeztah merged commit e773c4e into docker:master May 4, 2022
@thaJeztah thaJeztah deleted the carry_270_centos9 branch May 4, 2022 17:02
This was referenced May 4, 2022
Open
Merged
alunsin pushed a commit to alunsin/docker-ce-build that referenced this pull request May 6, 2022
Fix centOS 9 Stream
6c2c805 
See docker/containerd-packaging#283
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tianon tianon tianon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @Romain-Geissler-1A @tianon