!131 减少编译线程数,修改ceph-16.2.7-sw64.patch的名字

From: @wangzengliang1 
Reviewed-by: @liuqinfei 
Signed-off-by: @liuqinfei
This commit is contained in:
openeuler-ci-bot 2022-11-14 06:00:30 +00:00 committed by Gitee
commit 4737b34bfd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 3 deletions

View File

View File

@ -125,7 +125,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.2.7 Version: 16.2.7
Release: 7 Release: 8
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2 Epoch: 2
%endif %endif
@ -150,7 +150,7 @@ Patch4: 0004-cmake-add-support-python-3.10.patch
Patch5: 0005-ceph-volume-lvm-api-function-no-undefined.patch Patch5: 0005-ceph-volume-lvm-api-function-no-undefined.patch
Patch6: 0006-ceph-volume-decrease-number-of-pvs-calls-in-lvm-list.patch Patch6: 0006-ceph-volume-decrease-number-of-pvs-calls-in-lvm-list.patch
Patch7: 0007-bluestore-use-direct-write-for-bdevlabel.patch Patch7: 0007-bluestore-use-direct-write-for-bdevlabel.patch
Patch8: ceph-16.2.7-sw.patch Patch8: 0008-enable-sw64-architecture.patch
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -1248,7 +1248,7 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
%endif %endif
# Parallel build settings ... # Parallel build settings ...
CEPH_MFLAGS_JOBS="-j20" CEPH_MFLAGS_JOBS="-j16"
CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
%if 0%{?__isa_bits} == 32 %if 0%{?__isa_bits} == 32
# 32-bit builds can use 3G memory max, which is not enough even for -j2 # 32-bit builds can use 3G memory max, which is not enough even for -j2
@ -2492,6 +2492,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Nov Thu 10 2022 wangzengliang <wangzengliang1@huawei.com> - 2:16.2.7-8
- rename sw64 patch and reduce compilation threads
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 2:16.2.7-7 * Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 2:16.2.7-7
- Add sw64 architecture - Add sw64 architecture