Hello community, here is the log from the commit of package tcmu-runner for openSUSE:Factory checked in at 2018-10-22 11:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tcmu-runner (Old) and /work/SRC/openSUSE:Factory/.tcmu-runner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcmu-runner" Mon Oct 22 11:25:03 2018 rev:7 rq:643274 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tcmu-runner/tcmu-runner.changes 2018-02-14 09:46:15.419546779 +0100 +++ /work/SRC/openSUSE:Factory/.tcmu-runner.new/tcmu-runner.changes 2018-10-22 11:25:09.323047531 +0200 @@ -1,0 +2,20 @@ +Fri Oct 19 18:19:42 UTC 2018 - [email protected] + +- Update to version 1.4.0: + * tcmu-runner: bump version to 1.4.0 + * Disable explicit alua support. + * logger: notification on changing the options for dynamic reloading + * logger: update .gitignore for logrotate.conf_install.cmake + * logger: fix the return value + * Sync sig handler naming. + * Add logrotate support + * Move starting log message. + * Allow log file restart from SIGHUP + * Simplify log outputs + Replacing tcmu-runner-1.3.0.tar.gz with tcmu-runner-1.4.0.tar.xz, + updating the SPEC file, and removing patches: + * api-avoid-compiler-Werror-return-type-failures.patch + * build-drop-versionless-libtcmu.so-symlink.patch + * tcmu-runner-remove-uio-include-for-iovec.patch + +------------------------------------------------------------------- Old: ---- api-avoid-compiler-Werror-return-type-failures.patch build-drop-versionless-libtcmu.so-symlink.patch tcmu-runner-1.3.0.tar.gz tcmu-runner-remove-uio-include-for-iovec.patch New: ---- _service _servicedata file_zbc-fixed-compile-error-under-ppc64le file_zbc-optionally-build-zbc-handler tcmu-runner-1.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcmu-runner.spec ++++++ --- /var/tmp/diff_new_pack.qBycxg/_old 2018-10-22 11:25:10.079046784 +0200 +++ /var/tmp/diff_new_pack.qBycxg/_new 2018-10-22 11:25:10.079046784 +0200 @@ -26,19 +26,24 @@ %endif %endif +%if 0%{?sle_version} == 0 +%ifarch aarch64 x86_64 +%define build_handler_zbc 1 +%endif +%endif + Name: tcmu-runner -Version: 1.3.0 +Version: 1.4.0 Release: 0 Summary: A userspace daemon that handles the LIO TCM-User backstore License: Apache-2.0 Group: System/Management Url: https://github.com/agrover/%{name} -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.xz Patch1: %{name}-handler_file-add-libtcmu.patch -Patch7: %{name}-remove-handler-path-install-prefix.patch -Patch9: %{name}-remove-uio-include-for-iovec.patch -Patch10: api-avoid-compiler-Werror-return-type-failures.patch -Patch11: build-drop-versionless-libtcmu.so-symlink.patch +Patch2: %{name}-remove-handler-path-install-prefix.patch +Patch3: file_zbc-fixed-compile-error-under-ppc64le +Patch4: file_zbc-optionally-build-zbc-handler BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: glib2-devel @@ -49,10 +54,14 @@ %if 0%{?build_handler_rbd} BuildRequires: librbd-devel %endif +%if 0%{?build_handler_zbc} +BuildRequires: libzbc-devel +%endif BuildRequires: libkmod-devel BuildRequires: libnl3-devel BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel +Requires: logrotate %{?systemd_requires} %description @@ -107,15 +116,23 @@ RBD images. %endif +%if 0%{?build_handler_zbc} +%package handler-zbc +Summary: Ceph ZBC handler for tcmu-runner +Group: System/Libraries +Requires: tcmu-runner = %{version} + +%description handler-zbc +This package contains the Ceph RADOS ZBC disc emulation, using a +file backstore in tcmu-runner. +%endif + %prep %setup %patch1 -p1 -%patch7 -p1 -%if 0%{?suse_version} >= 1330 -%patch9 -p1 -%endif -%patch10 -p1 -%patch11 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build CMAKE_OPTIONS="\ @@ -130,6 +147,11 @@ %else -Dwith-rbd=0 \ %endif +%if 0%{?build_handler_zbc} + -Dwith-zbc=1 \ +%else + -Dwith-zbc=0 \ +%endif " %cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ ${CMAKE_OPTIONS} @@ -162,7 +184,9 @@ %defattr(-,root,root) %{_bindir}/tcmu-runner %{_sbindir}/rctcmu-runner -%doc README.md LICENSE +%doc README.md +%license LICENSE.Apache2 +%license LICENSE.LGPLv2.1 %dir %{_libdir}/tcmu-runner %{_libdir}/tcmu-runner/handler_qcow.so %dir %{_datadir}/dbus-1 @@ -173,6 +197,7 @@ %config %{_sysconfdir}/dbus-1/system.d/tcmu-runner.conf %{_unitdir}/tcmu-runner.service %doc %{_mandir}/man8/tcmu-runner.8%{ext_man} +%config %{_sysconfdir}/logrotate.d/tcmu-runner %files -n libtcmu2 %defattr(-,root,root) @@ -190,4 +215,9 @@ %{_libdir}/tcmu-runner/handler_rbd.so %endif +%if 0%{?build_handler_zbc} +%files handler-zbc +%{_libdir}/tcmu-runner/handler_file_zbc.so +%endif + %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/open-iscsi/tcmu-runner.git</param> <param name="subdir"></param> <param name="filename">tcmu-runner</param> <param name="versionformat">1.4.0</param> <param name="revision">v1.4.0</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">tcmu-runner*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/open-iscsi/tcmu-runner.git</param> <param name="changesrevision">2c125073c597139a00d3bbab6b5ae233a74e657b</param></service></servicedata>++++++ file_zbc-fixed-compile-error-under-ppc64le ++++++ From: Jason Dillaman <[email protected]> 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 <[email protected]> Acked-by: Lee Duncan <[email protected]> --- 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 ++++++ From: Jason Dillaman <[email protected]> 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 <[email protected]> Acked-by: Lee Duncan <[email protected]> --- 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) ++++++ tcmu-runner-handler_file-add-libtcmu.patch ++++++ --- /var/tmp/diff_new_pack.qBycxg/_old 2018-10-22 11:25:10.139046724 +0200 +++ /var/tmp/diff_new_pack.qBycxg/_new 2018-10-22 11:25:10.139046724 +0200 @@ -1,8 +1,10 @@ -Index: tcmu-runner-1.2.0/CMakeLists.txt -=================================================================== ---- tcmu-runner-1.2.0.orig/CMakeLists.txt -+++ tcmu-runner-1.2.0/CMakeLists.txt -@@ -131,6 +131,7 @@ add_library(handler_file +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,6 +146,7 @@ add_library(handler_file SHARED file_example.c )
