New version (1:10.2.1-1)
- Disable erasure_codelib neon build - Do not use -momit-leaf-frame-pointer flag - Sync up spec file with upstream
This commit is contained in:
Boris Ranto
parent
49e681f424
commit
e5a890ade4
@ -1,4 +1,4 @@
|
||||
From 45f04eb8ac97d953ed5d631f6ec227a217a27bec Mon Sep 17 00:00:00 2001
|
||||
From 854a65a1dc079101b827bed60ce5ea2185943e2c Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 11 Nov 2015 17:08:06 +0100
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ed5b88e6079b11b5f33b0795a5254e8e9c5f6e54 Mon Sep 17 00:00:00 2001
|
||||
From da169786d04025c98a7727040e0f5dd5c02245c2 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 22 Apr 2016 15:30:22 +0200
|
||||
Subject: [PATCH] Do not use -momit-leaf-frame-pointer flag
|
||||
|
||||
312
ceph.spec
312
ceph.spec
@ -79,8 +79,8 @@ restorecon -R /var/log/radosgw > /dev/null 2>&1;
|
||||
# common
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 10.2.0
|
||||
Release: 3%{?dist}
|
||||
Version: 10.2.1
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: User space components of the Ceph file system
|
||||
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
|
||||
@ -786,6 +786,7 @@ install -m 0644 -D etc/sysconfig/ceph $RPM_BUILD_ROOT%{_localstatedir}/adm/fillu
|
||||
install -m 0644 -D systemd/ceph-rbd-mirror.target $RPM_BUILD_ROOT%{_unitdir}/ceph-rbd-mirror.target
|
||||
install -m 0644 -D systemd/ceph-disk@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk@.service
|
||||
install -m 0755 -D systemd/ceph $RPM_BUILD_ROOT%{_sbindir}/rcceph
|
||||
install -m 0644 -D systemd/50-ceph.preset $RPM_BUILD_ROOT%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
||||
%else
|
||||
install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
|
||||
install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
|
||||
@ -858,6 +859,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/cephfs
|
||||
%if 0%{?_with_systemd}
|
||||
%{_unitdir}/ceph-create-keys@.service
|
||||
%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
||||
%else
|
||||
%{_initrddir}/ceph
|
||||
%endif
|
||||
@ -912,70 +914,35 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%attr(770,ceph,ceph) %dir %{_localstatedir}/run/ceph
|
||||
%endif
|
||||
|
||||
%pre base
|
||||
%if 0%{?_with_systemd}
|
||||
%if 0%{?suse_version}
|
||||
# service_add_pre and friends don't work with parameterized systemd service
|
||||
# instances, only with single services or targets, so we always pass
|
||||
# ceph.target to these macros
|
||||
%service_add_pre ceph.target
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%post base
|
||||
/sbin/ldconfig
|
||||
%if 0%{?_with_systemd}
|
||||
%if 0%{?suse_version}
|
||||
%fillup_only
|
||||
%service_add_post ceph.target
|
||||
%endif
|
||||
%else
|
||||
/sbin/chkconfig --add ceph
|
||||
%if 0%{?suse_version}
|
||||
%fillup_only
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun base
|
||||
%if 0%{?_with_systemd}
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph.target
|
||||
%endif
|
||||
# Disable and stop on removal.
|
||||
if [ $1 = 0 ] ; then
|
||||
SERVICE_LIST=$(systemctl | grep -E '^ceph-mon@|^ceph-create-keys@|^ceph-osd@|^ceph-mds@|^ceph-disk-' | cut -d' ' -f1)
|
||||
if [ -n "$SERVICE_LIST" ]; then
|
||||
for SERVICE in $SERVICE_LIST; do
|
||||
/usr/bin/systemctl --no-reload disable $SERVICE > /dev/null 2>&1 || :
|
||||
/usr/bin/systemctl stop $SERVICE > /dev/null 2>&1 || :
|
||||
done
|
||||
fi
|
||||
fi
|
||||
%else
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
if [ $1 = 0 ] ; then
|
||||
/sbin/service ceph stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del ceph
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph.target
|
||||
%endif
|
||||
|
||||
%postun base
|
||||
/sbin/ldconfig
|
||||
%if 0%{?_with_systemd}
|
||||
if [ $1 = 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
SERVICE_LIST=$(systemctl | grep -E '^ceph-mon@|^ceph-create-keys@|^ceph-osd@|^ceph-mds@|^ceph-disk-' | cut -d' ' -f1)
|
||||
if [ -n "$SERVICE_LIST" ]; then
|
||||
for SERVICE in $SERVICE_LIST; do
|
||||
/usr/bin/systemctl try-restart $SERVICE > /dev/null 2>&1 || :
|
||||
done
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph.target
|
||||
%endif
|
||||
|
||||
#################################################################################
|
||||
@ -1081,6 +1048,46 @@ fi
|
||||
%endif
|
||||
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mds
|
||||
|
||||
%post mds
|
||||
%if 0%{?suse_version}
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph-mds@\*.service ceph-mds.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph-mds@\*.service ceph-mds.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun mds
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph-mds@\*.service ceph-mds.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-mds@\*.service ceph-mds.target
|
||||
%endif
|
||||
|
||||
%postun mds
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-mds@\*.service ceph-mds.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph-mds@\*.service ceph-mds.target
|
||||
%endif
|
||||
if [ $FIRST_ARG -ge 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
/usr/bin/systemctl try-restart ceph-mds@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
#################################################################################
|
||||
%files mon
|
||||
%{_bindir}/ceph-mon
|
||||
@ -1096,6 +1103,46 @@ fi
|
||||
%endif
|
||||
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
|
||||
|
||||
%post mon
|
||||
%if 0%{?suse_version}
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun mon
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target
|
||||
%endif
|
||||
|
||||
%postun mon
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target
|
||||
%endif
|
||||
if [ $FIRST_ARG -ge 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
/usr/bin/systemctl try-restart ceph-create-keys@\*.service ceph-mon@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
#################################################################################
|
||||
%files fuse
|
||||
%defattr(-,root,root,-)
|
||||
@ -1123,6 +1170,46 @@ fi
|
||||
%{_unitdir}/ceph-rbd-mirror.target
|
||||
%endif
|
||||
|
||||
%post -n rbd-mirror
|
||||
%if 0%{?suse_version}
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph-rbd-mirror@\*.service ceph-rbd-mirror.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun -n rbd-mirror
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
|
||||
%endif
|
||||
|
||||
%postun -n rbd-mirror
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
|
||||
%endif
|
||||
if [ $FIRST_ARG -ge 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
/usr/bin/systemctl try-restart ceph-rbd-mirror@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
#################################################################################
|
||||
%files -n rbd-nbd
|
||||
%defattr(-,root,root,-)
|
||||
@ -1149,48 +1236,44 @@ fi
|
||||
%endif
|
||||
|
||||
%post radosgw
|
||||
/sbin/ldconfig
|
||||
%if 0%{?suse_version}
|
||||
# explicit systemctl daemon-reload (that's the only relevant bit of
|
||||
# service_add_post; the rest is all sysvinit --> systemd migration which
|
||||
# isn't applicable in this context (see above comment).
|
||||
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph-radosgw@\*.service ceph-radosgw.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph-radosgw@\*.service ceph-radosgw.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun radosgw
|
||||
%if 0%{?_with_systemd}
|
||||
# Disable and stop on removal.
|
||||
if [ $1 = 0 ] ; then
|
||||
SERVICE_LIST=$(systemctl | grep -E '^ceph-radosgw@' | cut -d' ' -f1)
|
||||
if [ -n "$SERVICE_LIST" ]; then
|
||||
for SERVICE in $SERVICE_LIST; do
|
||||
/usr/bin/systemctl --no-reload disable $SERVICE > /dev/null 2>&1 || :
|
||||
/usr/bin/systemctl stop $SERVICE > /dev/null 2>&1 || :
|
||||
done
|
||||
fi
|
||||
fi
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph-radosgw@\*.service ceph-radosgw.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-radosgw@\*.service ceph-radosgw.target
|
||||
%endif
|
||||
|
||||
%postun radosgw
|
||||
/sbin/ldconfig
|
||||
%if 0%{?_with_systemd}
|
||||
if [ $1 = 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
SERVICE_LIST=$(systemctl | grep -E '^ceph-radosgw@' | cut -d' ' -f1)
|
||||
if [ -n "$SERVICE_LIST" ]; then
|
||||
for SERVICE in $SERVICE_LIST; do
|
||||
/usr/bin/systemctl try-restart $SERVICE > /dev/null 2>&1 || :
|
||||
done
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-radosgw@\*.service ceph-radosgw.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph-radosgw@\*.service ceph-radosgw.target
|
||||
%endif
|
||||
if [ $FIRST_ARG -ge 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
/usr/bin/systemctl try-restart ceph-radosgw@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
#################################################################################
|
||||
%files osd
|
||||
@ -1218,6 +1301,46 @@ fi
|
||||
%endif
|
||||
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
|
||||
|
||||
%post osd
|
||||
%if 0%{?suse_version}
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/usr/bin/systemctl preset ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_post ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target
|
||||
%endif
|
||||
/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
|
||||
|
||||
%preun osd
|
||||
%if 0%{?suse_version}
|
||||
%service_del_preun ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target
|
||||
%endif
|
||||
|
||||
%postun osd
|
||||
test -n "$FIRST_ARG" || FIRST_ARG=$1
|
||||
%if 0%{?suse_version}
|
||||
DISABLE_RESTART_ON_UPDATE="yes"
|
||||
%service_del_postun ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_postun ceph-disk@\*.service ceph-osd@\*.service ceph-osd.target
|
||||
%endif
|
||||
if [ $FIRST_ARG -ge 1 ] ; then
|
||||
# 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.
|
||||
SYSCONF_CEPH=/etc/sysconfig/ceph
|
||||
if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
|
||||
source $SYSCONF_CEPH
|
||||
fi
|
||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
||||
/usr/bin/systemctl try-restart ceph-disk@\*.service ceph-osd@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
#################################################################################
|
||||
%if %{with ocf}
|
||||
|
||||
@ -1463,7 +1586,7 @@ else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test "$OLD_POLVER" == "$NEW_POLVER"; then
|
||||
if test "$OLD_POLVER" = "$NEW_POLVER"; then
|
||||
# Do not relabel if policy version did not change
|
||||
exit 0
|
||||
fi
|
||||
@ -1564,6 +1687,11 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:10.2.1-1
|
||||
- New version (1:10.2.1-1)
|
||||
- Disable erasure_codelib neon build
|
||||
- Do not use -momit-leaf-frame-pointer flag
|
||||
|
||||
* Fri May 06 2016 Dan Horák <dan[at]danny.cz> - 10.2.0-3
|
||||
- fix build on s390(x) - gperftools/tcmalloc not available there
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user