diff --git a/_service b/_service index 999cd00..a5b730d 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 12.0.0+git.%ct.%h + 12.0.1+git.%ct.%h git://github.com/SUSE/ceph.git ses5 ceph diff --git a/ceph-12.0.0+git.1489432599.165c23f.tar.bz2 b/ceph-12.0.0+git.1489432599.165c23f.tar.bz2 deleted file mode 100644 index 9fb91d9..0000000 --- a/ceph-12.0.0+git.1489432599.165c23f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d66f1557f57cac3a913e8f6096e000ae4a4716121bf86df0596a17ba8b81942 -size 104085476 diff --git a/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 b/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 new file mode 100644 index 0000000..e9abd70 --- /dev/null +++ b/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17efb0451aa525513fdd2291668a5fdb7db3de6892eaed1fde41ec0961d81cb1 +size 104267935 diff --git a/ceph-test.changes b/ceph-test.changes index eeb24da..2cba4d7 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.1+git.1491557762.4e47e9f + + merge upstream master (2950ad91d25d0d6e2e3fb6842d5bbc36353ba2a5) + including fixes for: + * bsc#1030068 (s390 build) + * bsc#1031311 (ceph-mon.service not enabled via systemd preset) + +------------------------------------------------------------------- +Tue Apr 4 13:42:40 UTC 2017 - ncutler@suse.com + +- Mention bugs fixed in jewel codestream that are also fixed in the current + codestream: + + msg/simple/Pipe: avoid returning 0 on poll timeout (bsc#1014338) + + build/ops: fix undefined crypto references with --with-xio (bsc#977940) + + ceph-create-keys: add missing argument comma (bsc#1008894) + + common: Improve linux dcache hash algorithm (bsc#1005179) + ------------------------------------------------------------------- Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 8d79b14..b789f14 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.0+git.1489432599.165c23f +Version: 12.0.1+git.1491557762.4e47e9f Release: 0 Summary: Ceph benchmarks and test tools 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 @@ -363,6 +363,17 @@ export CXXFLAGS="$RPM_OPT_FLAGS" env | sort +%if %{with lowmem_builder} +%if 0%{?jobs} > 8 +%define _smp_mflags -j8 +%endif +%endif + +# unlimit _smp_mflags in system macro if not set above +%define _smp_ncpus_max 0 +# extract the number of processors for use with cmake +%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//') + mkdir build cd build cmake .. \ @@ -401,8 +412,9 @@ cmake .. \ %endif $CEPH_EXTRA_CMAKE_ARGS \ %if 0%{with ocf} - -DWITH_OCF=ON + -DWITH_OCF=ON \ %endif + -DBOOST_J=%{_smp_ncpus} # Parallel build settings ... PARALLEL_BUILD=%{?_smp_mflags} @@ -612,7 +624,7 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service rm -rf %{buildroot}%{_unitdir}/ceph-radosgw.target rm -rf %{buildroot}%{_bindir}/ceph-clsinfo -rm -rf %{buildroot}%{_bindir}/ceph-bluefs-tool +rm -rf %{buildroot}%{_bindir}/ceph-bluestore-tool rm -rf %{buildroot}%{_bindir}/ceph-objectstore-tool rm -rf %{buildroot}%{_bindir}/ceph-osd rm -rf %{buildroot}%{_sbindir}/ceph-disk diff --git a/ceph.changes b/ceph.changes index eeb24da..2cba4d7 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.1+git.1491557762.4e47e9f + + merge upstream master (2950ad91d25d0d6e2e3fb6842d5bbc36353ba2a5) + including fixes for: + * bsc#1030068 (s390 build) + * bsc#1031311 (ceph-mon.service not enabled via systemd preset) + +------------------------------------------------------------------- +Tue Apr 4 13:42:40 UTC 2017 - ncutler@suse.com + +- Mention bugs fixed in jewel codestream that are also fixed in the current + codestream: + + msg/simple/Pipe: avoid returning 0 on poll timeout (bsc#1014338) + + build/ops: fix undefined crypto references with --with-xio (bsc#977940) + + ceph-create-keys: add missing argument comma (bsc#1008894) + + common: Improve linux dcache hash algorithm (bsc#1005179) + ------------------------------------------------------------------- Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 0567179..64862c3 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.0+git.1489432599.165c23f +Version: 12.0.1+git.1491557762.4e47e9f Release: 0 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 @@ -796,6 +796,17 @@ export CXXFLAGS="$RPM_OPT_FLAGS" env | sort +%if %{with lowmem_builder} +%if 0%{?jobs} > 8 +%define _smp_mflags -j8 +%endif +%endif + +# unlimit _smp_mflags in system macro if not set above +%define _smp_ncpus_max 0 +# extract the number of processors for use with cmake +%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//') + mkdir build cd build cmake .. \ @@ -834,8 +845,9 @@ cmake .. \ %endif $CEPH_EXTRA_CMAKE_ARGS \ %if 0%{with ocf} - -DWITH_OCF=ON + -DWITH_OCF=ON \ %endif + -DBOOST_J=%{_smp_ncpus} # Parallel build settings ... PARALLEL_BUILD=%{?_smp_mflags} @@ -1228,11 +1240,11 @@ fi %post mon %if 0%{?suse_version} if [ $1 -eq 1 ] ; then - /usr/bin/systemctl preset ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || : + /usr/bin/systemctl preset 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 +%systemd_post ceph-mon@\*.service ceph-mon.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : @@ -1240,20 +1252,20 @@ fi %preun mon %if 0%{?suse_version} -%service_del_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%service_del_preun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%systemd_preun 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 +%service_del_postun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%systemd_postun 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 @@ -1263,7 +1275,7 @@ if [ $FIRST_ARG -ge 1 ] ; 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 || : + /usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || : fi fi @@ -1391,7 +1403,7 @@ fi %files osd %{_bindir}/ceph-clsinfo -%{_bindir}/ceph-bluefs-tool +%{_bindir}/ceph-bluestore-tool %{_bindir}/ceph-objectstore-tool %{_bindir}/ceph-osd %{_sbindir}/ceph-disk