Skip to content

[TAR-514] RHEL 8 Support#83

Merged
seemethere merged 1 commit intomasterfrom
rhel8
Mar 12, 2019
Merged

[TAR-514] RHEL 8 Support#83
seemethere merged 1 commit intomasterfrom
rhel8

Conversation

@dave-tucker
Copy link
Copy Markdown
Contributor

@dave-tucker dave-tucker commented Mar 4, 2019

This commit adds the necessary Makefile/Dockerfile changes to support
packaging on RHEL 8. Notably BTRFS is disabled for containerd builds on
this OS as the btrfs-progs package is not available during the beta. It
may also not be available at GA.

Signed-off-by: Dave Tucker dt@docker.com

Comment thread Makefile Outdated
@dave-tucker
Copy link
Copy Markdown
Contributor Author

No matching package to install: 'btrfs-progs-devel'
No matching package to install: 'libseccomp-devel'

Need to find a way to get ☝️ installed before this can be merged

@dave-tucker dave-tucker changed the title [WIP] [TAR-514] RHEL 8 Support [TAR-514] RHEL 8 Support Mar 5, 2019
@dave-tucker
Copy link
Copy Markdown
Contributor Author

@dave-tucker dave-tucker requested a review from a team March 5, 2019 00:25
seemethere
seemethere previously approved these changes Mar 5, 2019
Copy link
Copy Markdown
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

Can confirm this functions as expected:

Wrote: /root/rpmbuild/SRPMS/containerd.io-1.2.4-3.1.el8.src.rpm
Wrote: /root/rpmbuild/RPMS/x86_64/containerd.io-1.2.4-3.1.el8.x86_64.rpm

@dave-tucker
Copy link
Copy Markdown
Contributor Author

@seemethere I broke other RPM builds with my clumsy specfile'ing. Could you take a look to see how to fix the conditional with no_btrfs as I'm out of my depth here 🤽‍♂️

seemethere
seemethere previously approved these changes Mar 11, 2019
@dave-tucker
Copy link
Copy Markdown
Contributor Author

I can't approve my own PR but LGTM on green.

This commit adds the necessary Makefile/Dockerfile changes to support
packaging on RHEL 8. Notably BTRFS is disabled for containerd builds on
this OS as the btrfs-progs package is not available during the beta. It
may also not be available at GA.

Signed-off-by: Dave Tucker <dt@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@seemethere
Copy link
Copy Markdown
Contributor

Alright had another push, some notes from this last one:

  • btrfs dependencies will only be installed if we are not on rhel 8 (or centos 8)
  • BUILDTAGS can and should be defined as environment variables

@seemethere seemethere merged commit f7214d7 into master Mar 12, 2019
@seemethere seemethere deleted the rhel8 branch August 7, 2019 22:37
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