Hello community,
here is the log from the commit of package tcmu-runner for openSUSE:Factory checked in at 2019-06-01 09:55:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcmu-runner (Old)
and /work/SRC/openSUSE:Factory/.tcmu-runner.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcmu-runner"
Sat Jun 1 09:55:50 2019 rev:8 rq:706357 version:1.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcmu-runner/tcmu-runner.changes 2018-10-22 11:25:09.323047531 +0200
+++ /work/SRC/openSUSE:Factory/.tcmu-runner.new.5148/tcmu-runner.changes 2019-06-01 09:55:51.995193869 +0200
@@ -1,0 +2,15 @@
+Wed May 22 13:32:52 UTC 2019 - David Disseldorp
+
+- Add explicit libtcmu package dependency to avoid incorrect upstream
+ .so versioning; (bsc#1135815)
+
+-------------------------------------------------------------------
+Tue May 21 13:48:20 UTC 2019 - David Disseldorp
+
+- Rename openSUSE zbc patches:
+ + file_zbc-fixed-compile-error-under-ppc64le ->
+ file_zbc-fixed-compile-error-under-ppc64le.patch
+ + file_zbc-optionally-build-zbc-handler ->
+ file_zbc-optionally-build-zbc-handler.patch
+
+-------------------------------------------------------------------
@@ -19,0 +35 @@
+ * support custom cephx credentials; (bsc#1135369)
Old:
----
file_zbc-fixed-compile-error-under-ppc64le
file_zbc-optionally-build-zbc-handler
New:
----
file_zbc-fixed-compile-error-under-ppc64le.patch
file_zbc-optionally-build-zbc-handler.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcmu-runner.spec ++++++
--- /var/tmp/diff_new_pack.hg59Hk/_old 2019-06-01 09:55:52.611193658 +0200
+++ /var/tmp/diff_new_pack.hg59Hk/_new 2019-06-01 09:55:52.615193657 +0200
@@ -1,7 +1,7 @@
#
# spec file for package tcmu-runner
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -42,8 +42,8 @@
Source: %{name}-%{version}.tar.xz
Patch1: %{name}-handler_file-add-libtcmu.patch
Patch2: %{name}-remove-handler-path-install-prefix.patch
-Patch3: file_zbc-fixed-compile-error-under-ppc64le
-Patch4: file_zbc-optionally-build-zbc-handler
+Patch3: file_zbc-fixed-compile-error-under-ppc64le.patch
+Patch4: file_zbc-optionally-build-zbc-handler.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: glib2-devel
@@ -61,6 +61,7 @@
BuildRequires: libnl3-devel
BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel
+Requires: libtcmu2 = %{version}
Requires: logrotate
%{?systemd_requires}
++++++ file_zbc-fixed-compile-error-under-ppc64le.patch ++++++
From: Jason Dillaman
Date: Tue, 9 Oct 2018 12:52:28 -0400
Subject: file_zbc: fixed compile error under ppc64le
Git-repo: https://github.com/agrover/tcmu-runner.git
Git-commit: bc4cfb8cc88f3c97e77840e0c4dcd63f04dcc147
Signed-off-by: Jason Dillaman
Acked-by: Lee Duncan
---
file_zbc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/file_zbc.c b/file_zbc.c
index 99f6b42dbc12..783c2a149e61 100644
--- a/file_zbc.c
+++ b/file_zbc.c
@@ -2060,8 +2060,8 @@ static int zbc_write_check_zones(struct tcmu_device *dev,
/* Check LBA on write pointer */
if (zbc_zone_seq_req(zone) && lba != zone->wp) {
- tcmu_dev_err(dev, "Unaligned write lba %"PRIu64", wp %llu\n",
- lba, zone->wp);
+ tcmu_dev_err(dev, "Unaligned write lba %"PRIu64", wp %"PRIu64"\n",
+ lba, (uint64_t)zone->wp);
return tcmu_set_sense_data(cmd->sense_buf,
ILLEGAL_REQUEST,
ASC_UNALIGNED_WRITE_COMMAND);
++++++ file_zbc-optionally-build-zbc-handler.patch ++++++
From: Jason Dillaman
Date: Tue, 9 Oct 2018 12:56:35 -0400
Subject: file_zbc: optionally build zbc handler
Git-repo: https://github.com/agrover/tcmu-runner.git
Git-commit: aa87146e0ef46e535dd5ba6243a41323de6b53a4
Signed-off-by: Jason Dillaman
Acked-by: Lee Duncan
---
CMakeLists.txt | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a4c4b0a3197..01f7777d4357 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ set(tcmu-runner_HANDLER_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/tc
option(with-glfs "build Gluster glfs handler" true)
option(with-qcow "build qcow handler" true)
option(with-rbd "build Ceph rbd handler" true)
+option(with-zbc "build zbc handler" true)
find_library(LIBNL_LIB nl-3)
find_library(LIBNL_GENL_LIB nl-genl-3)
@@ -168,26 +169,28 @@ target_include_directories(handler_file_optical
)
target_link_libraries(handler_file_optical ${PTHREAD})
-# Stuff for building the file zbc handler
-add_library(handler_file_zbc
- SHARED
- file_zbc.c
- )
-set_target_properties(handler_file_zbc
- PROPERTIES
- PREFIX ""
- )
-target_include_directories(handler_file_zbc
- PUBLIC ${PROJECT_SOURCE_DIR}/ccan
- )
-install(TARGETS handler_file_zbc DESTINATION ${CMAKE_INSTALL_LIBDIR}/tcmu-runner)
-
# The minimal library consumer
add_executable(consumer
consumer.c
)
target_link_libraries(consumer tcmu)
+if (with-zbc)
+ # Stuff for building the file zbc handler
+ add_library(handler_file_zbc
+ SHARED
+ file_zbc.c
+ )
+ set_target_properties(handler_file_zbc
+ PROPERTIES
+ PREFIX ""
+ )
+ target_include_directories(handler_file_zbc
+ PUBLIC ${PROJECT_SOURCE_DIR}/ccan
+ )
+ install(TARGETS handler_file_zbc DESTINATION ${CMAKE_INSTALL_LIBDIR}/tcmu-runner)
+endif (with-zbc)
+
if (with-rbd)
find_library(LIBRBD rbd)