From d429a1a6cfc5637ec4973176b92962ed5e03e03a Mon Sep 17 00:00:00 2001 From: wangzengliang1 Date: Thu, 10 Nov 2022 09:39:15 +0800 Subject: [PATCH] rename sw64 patch and reduce compilation threads --- ...6.2.7-sw.patch => 0008-enable-sw64-architecture.patch | 0 ceph.spec | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename ceph-16.2.7-sw.patch => 0008-enable-sw64-architecture.patch (100%) mode change 100755 => 100644 diff --git a/ceph-16.2.7-sw.patch b/0008-enable-sw64-architecture.patch old mode 100755 new mode 100644 similarity index 100% rename from ceph-16.2.7-sw.patch rename to 0008-enable-sw64-architecture.patch diff --git a/ceph.spec b/ceph.spec index f13b3a6..b4000c0 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 7 +Release: 8 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -150,7 +150,7 @@ Patch4: 0004-cmake-add-support-python-3.10.patch Patch5: 0005-ceph-volume-lvm-api-function-no-undefined.patch Patch6: 0006-ceph-volume-decrease-number-of-pvs-calls-in-lvm-list.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} # _insert_obs_source_lines_here 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 # Parallel build settings ... -CEPH_MFLAGS_JOBS="-j20" +CEPH_MFLAGS_JOBS="-j16" CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') %if 0%{?__isa_bits} == 32 # 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 %changelog +* Nov Thu 10 2022 wangzengliang - 2:16.2.7-8 +- rename sw64 patch and reduce compilation threads + * Wed Oct 26 2022 wuzx - 2:16.2.7-7 - Add sw64 architecture -- Gitee