packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'openEuler-22.03-LTS' of https://gitee.com/wangzengliang1/ceph into openEuler-22.03-LTS

Browse Source
This commit is contained in:
wangzengliang 2022-04-08 08:47:42 +08:00
commit 173682e272
2 changed files with 17792 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17749
0003-isa-l-update.patch Normal file
View File

File diff suppressed because it is too large Load Diff

80
ceph.spec
View File

@ -125,7 +125,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.2.7 Version: 16.2.7
Release: 0 Release: 2
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2 Epoch: 2
%endif %endif
@ -143,9 +143,9 @@ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.7.tar.gz Source0: %{?_remote_tarball_prefix}ceph-16.2.7.tar.gz
# backport # backport
Patch0: 0001-fix-error-transform-is-not-a-member-of-std.patch Patch1: 0001-fix-error-transform-is-not-a-member-of-std.patch
Patch1: 0002-enable-install-deps-in-openEuler.patch Patch2: 0002-enable-install-deps-in-openEuler.patch
Patch3: 0003-isa-l-update.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
@ -1240,7 +1240,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="-j32" CEPH_MFLAGS_JOBS="-j20"
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
@ -1662,7 +1662,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mds@\*.service ceph-mds.target %systemd_post ceph-mds@\x2a.service ceph-mds.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || :
@ -1673,11 +1673,11 @@ fi
%service_del_preun ceph-mds@\*.service ceph-mds.target %service_del_preun ceph-mds@\*.service ceph-mds.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mds@\*.service ceph-mds.target %systemd_preun ceph-mds@\x2a.service ceph-mds.target
%endif %endif
%postun mds %postun mds
%systemd_postun ceph-mds@\*.service ceph-mds.target %systemd_postun ceph-mds@\x2a.service ceph-mds.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -1686,7 +1686,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mds@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-mds@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1706,7 +1706,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mgr@\*.service ceph-mgr.target %systemd_post ceph-mgr@\x2a.service ceph-mgr.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mgr.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-mgr.target >/dev/null 2>&1 || :
@ -1717,11 +1717,11 @@ fi
%service_del_preun ceph-mgr@\*.service ceph-mgr.target %service_del_preun ceph-mgr@\*.service ceph-mgr.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mgr@\*.service ceph-mgr.target %systemd_preun ceph-mgr@\x2a.service ceph-mgr.target
%endif %endif
%postun mgr %postun mgr
%systemd_postun ceph-mgr@\*.service ceph-mgr.target %systemd_postun ceph-mgr@\x2a.service ceph-mgr.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -1730,7 +1730,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-mgr@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1845,7 +1845,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-mon@\*.service ceph-mon.target %systemd_post ceph-mon@\x2a.service ceph-mon.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || :
@ -1856,11 +1856,11 @@ fi
%service_del_preun ceph-mon@\*.service ceph-mon.target %service_del_preun ceph-mon@\*.service ceph-mon.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-mon@\*.service ceph-mon.target %systemd_preun ceph-mon@\x2a.service ceph-mon.target
%endif %endif
%postun mon %postun mon
%systemd_postun ceph-mon@\*.service ceph-mon.target %systemd_postun ceph-mon@\x2a.service ceph-mon.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -1869,7 +1869,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-mon@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1894,7 +1894,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post cephfs-mirror@\*.service cephfs-mirror.target %systemd_post cephfs-mirror@\x2a.service cephfs-mirror.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start cephfs-mirror.target >/dev/null 2>&1 || : /usr/bin/systemctl start cephfs-mirror.target >/dev/null 2>&1 || :
@ -1905,11 +1905,11 @@ fi
%service_del_preun cephfs-mirror@\*.service cephfs-mirror.target %service_del_preun cephfs-mirror@\*.service cephfs-mirror.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun cephfs-mirror@\*.service cephfs-mirror.target %systemd_preun cephfs-mirror@\x2a.service cephfs-mirror.target
%endif %endif
%postun -n cephfs-mirror %postun -n cephfs-mirror
%systemd_postun cephfs-mirror@\*.service cephfs-mirror.target %systemd_postun cephfs-mirror@\x2a.service cephfs-mirror.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -1918,7 +1918,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart cephfs-mirror@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart cephfs-mirror@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1939,7 +1939,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %systemd_post ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || :
@ -1950,11 +1950,11 @@ fi
%service_del_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %service_del_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %systemd_preun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
%endif %endif
%postun -n rbd-mirror %postun -n rbd-mirror
%systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %systemd_postun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -1963,7 +1963,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-rbd-mirror@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-rbd-mirror@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1980,7 +1980,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %systemd_post ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-immutable-object-cache.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-immutable-object-cache.target >/dev/null 2>&1 || :
@ -1991,11 +1991,11 @@ fi
%service_del_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %service_del_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %systemd_preun ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
%endif %endif
%postun immutable-object-cache %postun immutable-object-cache
%systemd_postun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target %systemd_postun ceph-immutable-object-cache@\x2a.service ceph-immutable-object-cache.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -2004,7 +2004,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-immutable-object-cache@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-immutable-object-cache@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -2037,7 +2037,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-radosgw@\*.service ceph-radosgw.target %systemd_post ceph-radosgw@\x2a.service ceph-radosgw.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || :
@ -2048,12 +2048,12 @@ fi
%service_del_preun ceph-radosgw@\*.service ceph-radosgw.target %service_del_preun ceph-radosgw@\*.service ceph-radosgw.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-radosgw@\*.service ceph-radosgw.target %systemd_preun ceph-radosgw@\x2a.service ceph-radosgw.target
%endif %endif
%postun radosgw %postun radosgw
/sbin/ldconfig /sbin/ldconfig
%systemd_postun ceph-radosgw@\*.service ceph-radosgw.target %systemd_postun ceph-radosgw@\x2a.service ceph-radosgw.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -2062,7 +2062,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-radosgw@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-radosgw@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -2094,7 +2094,7 @@ if [ $1 -eq 1 ] ; then
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %systemd_post ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
@ -2110,11 +2110,11 @@ fi
%service_del_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %service_del_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
%systemd_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %systemd_preun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
%endif %endif
%postun osd %postun osd
%systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %systemd_postun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
# "yes". In any case: if units are not running, do not touch them. # "yes". In any case: if units are not running, do not touch them.
@ -2123,7 +2123,7 @@ if [ $1 -ge 1 ] ; then
source $SYSCONF_CEPH source $SYSCONF_CEPH
fi fi
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
/usr/bin/systemctl try-restart ceph-osd@\*.service ceph-volume@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-osd@\x2a.service ceph-volume@\x2a.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -2484,6 +2484,12 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Fri Mar 11 2022 wangzengliang <wangzengliang1@huawei.com> - 1:16.2.7-2
- fix * recognition error when install
* Fri Jan 14 2022 luo rixin <luorixin@huawei.com> - 1:16.2.7-1
- isa-l: update isa-l to fix aarch64 text relocation error
* Thu Dec 30 2021 liuqinfei <18138800392@163.com> - 1:16.2.7-0 * Thu Dec 30 2021 liuqinfei <18138800392@163.com> - 1:16.2.7-0
- update to 16.2.7 test - update to 16.2.7 test