]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: rpm: package crypto on x86_64 only 14779/head
authorNathan Cutler <ncutler@suse.com>
Tue, 25 Apr 2017 14:39:25 +0000 (16:39 +0200)
committerNathan Cutler <ncutler@suse.com>
Tue, 25 Apr 2017 14:47:36 +0000 (16:47 +0200)
ca40e12845e78e507a0c3f45efa1689979029874 added the following lines to the spec
file:

%dir %{_libdir}/ceph/crypto
%{_libdir}/ceph/crypto/libceph_*.so*

and 350932979b377b292edd12dc8c612945cd793e7a made it so those build artifacts
are generated on x86_64 only.

The result is a build failure on non-x86_64 architectures:

error: Directory not found: /home/abuild/rpmbuild/BUILDROOT/ceph-12.0.2+git.1493119152.181baf6-1.1.ppc64le/usr/lib64/ceph/crypto
error: File not found by glob: /home/abuild/rpmbuild/BUILDROOT/ceph-12.0.2+git.1493119152.181baf6-1.1.ppc64le/usr/lib64/ceph/crypto/libceph_*.so*

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index 0b2f1a71927238a65dfda56c96eda211e34b470f..1a9f037386cca9972d819886fd1ec03916157af8 100644 (file)
@@ -929,8 +929,10 @@ rm -rf %{buildroot}
 %{_libdir}/ceph/erasure-code/libec_*.so*
 %dir %{_libdir}/ceph/compressor
 %{_libdir}/ceph/compressor/libceph_*.so*
+%ifarch x86_64
 %dir %{_libdir}/ceph/crypto
 %{_libdir}/ceph/crypto/libceph_*.so*
+%endif
 %if %{with lttng}
 %{_libdir}/libos_tp.so*
 %{_libdir}/libosd_tp.so*