Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ceph for openSUSE:Factory checked in
at 2023-10-22 21:01:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph (Old)
and /work/SRC/openSUSE:Factory/.ceph.new.1945 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph"
Sun Oct 22 21:01:11 2023 rev:92 rq:1110338 version:16.2.14.66+g7aa6ce9419f
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph/ceph.changes 2023-08-18
19:27:50.315259890 +0200
+++ /work/SRC/openSUSE:Factory/.ceph.new.1945/ceph.changes 2023-10-22
21:01:27.264405695 +0200
@@ -1,0 +2,21 @@
+Mon Sep 11 09:06:12 UTC 2023 - Tim Serong <tser...@suse.com>
+
+- Update to 16.2.14-66-g7aa6ce9419f:
+ + (bsc#1207765) rgw/rados: check_quota() uses real bucket owner
+ + (bsc#1212559) pacific: os/bluestore: cumulative bluefs backport
+ This notably includes:
+ * os/bluestore: BlueFS fine grain locking
+ * os/bluestore/bluefs: Fix improper vselector tracking in _flush_special()
+ * os/bluestore: enable 4K allocation unit for BlueFS
+ * os/bluestore/bluefs: Fix sync compactionA
+ + (bsc#1213217) ceph.spec.in: Require fmt-devel < 10
+ + ceph.spec.in: enable build on riscv64 for openSUSE Factory
+ + ceph.spec.in: Require Cython >= 0.29 but < 3
+ + cephadm: update to the latest container images:
+ * registry.suse.com/ses/7.1/ceph/prometheus-server:2.37.6
+ * registry.suse.com/ses/7.1/ceph/prometheus-node-exporter:1.5.0
+ * registry.suse.com/ses/7.1/ceph/grafana:8.5.22
+ * registry.suse.com/ses/7.1/ceph/haproxy:2.0.31
+- Drop ceph-test.changes (no longer necessary since using _multibuild)
+
+-------------------------------------------------------------------
Old:
----
ceph-16.2.13-66-g54799ee0666.tar.bz2
ceph-test.changes
New:
----
ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-test.spec ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.304443512 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.308443658 +0200
@@ -138,7 +138,7 @@
# main package definition
#################################################################################
Name: ceph-test
-Version: 16.2.13.66+g54799ee0666
+Version: 16.2.14.66+g7aa6ce9419f
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -154,7 +154,7 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.13-66-g54799ee0666.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
%if 0%{?suse_version}
Source92: ceph-rpmlintrc
Source93: checkin.sh
@@ -214,7 +214,7 @@
BuildRequires: cryptsetup-devel
BuildRequires: libcurl-devel
BuildRequires: libcap-ng-devel
-BuildRequires: fmt-devel >= 5.2.1
+BuildRequires: ((fmt-devel >= 5.2.1 with fmt-devel < 10) or fmt-9-devel)
BuildRequires: pkgconfig(libudev)
BuildRequires: libnl3-devel
BuildRequires: liboath-devel
@@ -321,7 +321,7 @@
#BuildRequires: krb5-devel
BuildRequires: cunit-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
+BuildRequires: (python%{python3_pkgversion}-Cython >= 0.29 with
python%{python3_pkgversion}-Cython < 3)
BuildRequires: python%{python3_pkgversion}-PrettyTable
BuildRequires: python%{python3_pkgversion}-Sphinx
BuildRequires: rdma-core-devel
@@ -343,7 +343,7 @@
BuildRequires: CUnit-devel
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
+BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-prettytable
BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: lz4-devel >= 1.7
@@ -599,7 +599,7 @@
%if 0%{?suse_version}
%endif
%prep
-%autosetup -p1 -n ceph-16.2.13-66-g54799ee0666
+%autosetup -p1 -n ceph-16.2.14-66-g7aa6ce9419f
%build
# Disable lto on systems that do not support symver attribute
++++++ ceph.spec ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.332444531 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.336444676 +0200
@@ -138,7 +138,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 16.2.13.66+g54799ee0666
+Version: 16.2.14.66+g7aa6ce9419f
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -154,10 +154,10 @@
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.13-66-g54799ee0666.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
-ExclusiveArch: x86_64 aarch64 ppc64le s390x
+ExclusiveArch: x86_64 aarch64 ppc64le s390x riscv64
%endif
#################################################################################
# dependencies that apply across all distro families
@@ -202,7 +202,7 @@
BuildRequires: cryptsetup-devel
BuildRequires: libcurl-devel
BuildRequires: libcap-ng-devel
-BuildRequires: fmt-devel >= 5.2.1
+BuildRequires: ((fmt-devel >= 5.2.1 with fmt-devel < 10) or fmt-9-devel)
BuildRequires: pkgconfig(libudev)
BuildRequires: libnl3-devel
BuildRequires: liboath-devel
@@ -309,7 +309,7 @@
#BuildRequires: krb5-devel
BuildRequires: cunit-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
+BuildRequires: (python%{python3_pkgversion}-Cython >= 0.29 with
python%{python3_pkgversion}-Cython < 3)
BuildRequires: python%{python3_pkgversion}-PrettyTable
BuildRequires: python%{python3_pkgversion}-Sphinx
BuildRequires: rdma-core-devel
@@ -331,7 +331,7 @@
BuildRequires: CUnit-devel
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: %{python_module Cython >= 0.29.24 with %python-Cython < 3}
+BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-prettytable
BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: lz4-devel >= 1.7
@@ -1212,7 +1212,7 @@
# common
#################################################################################
%prep
-%autosetup -p1 -n ceph-16.2.13-66-g54799ee0666
+%autosetup -p1 -n ceph-16.2.14-66-g7aa6ce9419f
%build
# Disable lto on systems that do not support symver attribute
++++++ README-checkin.txt ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.372445985 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.376446131 +0200
@@ -11,8 +11,7 @@
Q. What is the pre_checkin.sh script?
-A. The "pre_checkin.sh" script generates ceph-test.spec from ceph.spec, and
-ceph-test.changes from ceph.changes.
+A. The "pre_checkin.sh" script generates ceph-test.spec from ceph.spec.
Q. Should I run it before running checkin.sh?
++++++ README-packaging.txt ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.404447149 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.408447294 +0200
@@ -10,11 +10,14 @@
The ceph.spec file is maintained upstream at https://github.com/ceph/ceph
-To patch it, use the following procedure:
+The Ceph package in OBS is built from SUSE's downstream fork at
+https://github.com/SUSE/ceph (specifically, the ses7p branch).
+
+To patch ceph.spec, ideally you should use the following procedure:
1. find out the current Factory ceph maintainer(s) (e.g. by examining the
most recent entries in the ceph.changes file)
-2. open PR targeting the master branch at https://github.com/ceph/ceph
+2. open PR targeting the main branch at https://github.com/ceph/ceph
Make sure to sign your commit ("git commit --signoff") using your real name
and real email address. If this is a problem, contact the current Factory
maintainers: they can act as a proxy.
@@ -24,6 +27,11 @@
reviewed, tested, merged and, if necessary, backported. They will also take
care
of submitting the patch to Factory.
+Alternately, for patches that make no sense to submit to upstream main,
+you can open a PR against the ses7p branch of https://github.com/SUSE/ceph
+then ping the Factory ceph maintainers to get that reviewed and submitted to
+Factory.
+
Caveat for testing
------------------
++++++ ceph-16.2.13-66-g54799ee0666.tar.bz2 ->
ceph-16.2.14-66-g7aa6ce9419f.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ceph/ceph-16.2.13-66-g54799ee0666.tar.bz2
/work/SRC/openSUSE:Factory/.ceph.new.1945/ceph-16.2.14-66-g7aa6ce9419f.tar.bz2
differ: char 11, line 1
++++++ checkin.sh ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.460449185 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.460449185 +0200
@@ -130,7 +130,7 @@
echo "Running \"osc add *bz2\" to register the new tarball"
osc add *bz2
-echo "Running pre_checkin.sh (if you touch the ceph.changes file after running
this script, re-run pre_checkin.sh manually)"
+echo "Running pre_checkin.sh"
if [ -f "pre_checkin.sh" ] ; then
bash pre_checkin.sh
else
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.sVWM8Q/_old 2023-10-22 21:01:28.484450058 +0200
+++ /var/tmp/diff_new_pack.sVWM8Q/_new 2023-10-22 21:01:28.488450203 +0200
@@ -265,12 +265,6 @@
sed -i "/${match_regex}/i $line_to_insert" $FILE
}
-function copy_changes_file {
- local dest_pkg=$1
-
- cp ceph.changes ${dest_pkg}.changes
-}
-
function set_build_constraints {
local FILE=$1
shift
@@ -312,7 +306,6 @@
insert_line_before "$PACKAGE.spec" "Source94: pre_checkin.sh" "^Source95:"
insert_line_before "$PACKAGE.spec" "Source93: checkin.sh" "^Source94:"
insert_line_before "$PACKAGE.spec" "Source92: ceph-rpmlintrc" "^Source93:"
-copy_changes_file $PACKAGE
set_build_constraints $SPEC_FILE "hardware:disk:size unit=G
${CEPH_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G
${CEPH_BUILD_MEMORY_SIZE_GB}"
set_build_constraints "$PACKAGE.spec" "hardware:disk:size unit=G
${CEPH_TEST_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G
${CEPH_TEST_BUILD_MEMORY_SIZE_GB}"
