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
rpm: RHEL 8 fixes #26520
rpm: RHEL 8 fixes #26520
Conversation
I've pushed this to ceph-ci.git, builds @ https://shaman.ceph.com/builds/ceph/rpm-rhel8/ |
ceph.spec.in
Outdated
@@ -249,8 +248,9 @@ BuildRequires: openldap-devel | |||
BuildRequires: openssl-devel | |||
BuildRequires: CUnit-devel | |||
BuildRequires: redhat-lsb-core | |||
%if 0%{?rhel} == 7 | |||
BuildRequires: btrfs-progs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC, @tchaikov has a commit that removes/changes this dependency/moves it to 'make check' deps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, Kefu can comment more on the btrfs-progs package. |
On RHEL 8, the python34-* and Cython packages are named identically to Fedora (eg "python3-Cython"). Move the Python 2 "Cython" and python34-* BuildRequires lines inside a RHEL 7 conditional, so RHEL 8 falls through to the Fedora package names. Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
On RHEL 7, this package is named "pyOpenSSL", but on RHEL 8, Fedora, and SUSE, it is named "python3-pyOpenSSL". Prior to this change, the RHEL conditional was applying to both RHEL 7 and 8, so we would fail to resolve the "pyOpenSSL" package dependency on RHEL 8. Update the RPM conditionals to use "pyOpenSSL" on RHEL 7 and "python3-pyOpenSSL" on all other distributions. Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
In RHEL 8, rpmbuild does not automatically generate __pycache__ directories. Generate them explicitly with the %py_byte_compile macro. Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Update the RPM packaging to build on RHEL 8.
btrfs-progs
is not available on RHEL 8__pycache__
(might apply to Fedora atsome point down the road)