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

rpm: package crypto libraries for all archs #26202

Merged
merged 1 commit into from Feb 5, 2019

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented Jan 30, 2019

Since 318a8e3 we are now building at least the
openssl crypto plugin on all architectures, not just x86_64.

This fixes the non-x86_64 builds for master.

Fixes: 318a8e3
Signed-off-by: Nathan Cutler ncutler@suse.com

@tchaikov tchaikov changed the title build/ops: exclude openssl crypto from s390x build rpm: exclude openssl crypto from s390x build Jan 30, 2019
@tchaikov
Copy link
Contributor

tchaikov commented Jan 30, 2019

@smithfarm IMHO, the title is a little bit confusing. we prevented rpmbuild from packaging {_libdir}/ceph/crypto/libceph_*.so* on non-amd64 platforms because, by then, the only crypto plugin was the isa-l plugin. see 3509329 . and s390 is apparently not amd64. hence rpmbuild was annoyed when asked to package a nonexistent directory/files. that's why we had 4b79ac9 to address this issue.

after 318a8e3, we now have something in that directory. so no reason to prevent rpmbuild from packaging usr/lib/ceph/crypto anymore. and that's exactly what this PR is doing.

but the title reads

exclude openssl crypto from s390x build

probably it should read

package crypto plugins on non-amd64 archs also

and we can put more details in the body of the commit message. currently, it reads:

Since the s390x build is intended for Ceph client enablement only, the RGW openssl encryption feature can simply be disabled on said architecture.

i think we don't necessarily have to disable the openssl plugin on non-amd64 architectures. this change actually addresses the packaging failure on all non-amd64 architectures previously excluded by HAVE_INTEL AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE).

s390 user can surely opt out of this. but i don't think we need to put this in the commit message. as it is not directly related to this change.

Since 318a8e3 we are now building at least the
openssl crypto plugin on all architectures, not just x86_64.

This fixes the non-x86_64 builds for master.

Fixes: 318a8e3
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm smithfarm changed the title rpm: exclude openssl crypto from s390x build rpm: package crypto libraries for all archs Feb 4, 2019
@smithfarm
Copy link
Contributor Author

@tchaikov Sorry, I used the wrong commit message by mistake. Please take another look?

@smithfarm
Copy link
Contributor Author

@tchaikov tchaikov merged commit 19691a7 into ceph:master Feb 5, 2019
@smithfarm smithfarm deleted the wip-fix-s390x-rpm-build branch February 5, 2019 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants