Hello community, here is the log from the commit of package targetcli for openSUSE:Factory checked in at 2016-07-12 23:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/targetcli (Old) and /work/SRC/openSUSE:Factory/.targetcli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "targetcli" Changes: -------- --- /work/SRC/openSUSE:Factory/targetcli/targetcli.changes 2015-12-21 12:04:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.targetcli.new/targetcli.changes 2016-07-12 23:52:10.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jul 7 15:40:10 UTC 2016 - [email protected] + +- replace %oname usage by regular %name + +------------------------------------------------------------------- +Wed May 11 06:50:03 UTC 2016 - [email protected] + +- Update to 3.0 pre4 version +- Remove targetcli-git-update.patch, because this package is + already updated to 3.0 pre4, no need for this patch anymore. +- Remove targetcli-fix-exit.patch, version 3.0 pre4 doesn't need + this patch, no such a bug in version 3.0 pre4. +- Rework on patch targetcli-fix-git-version-for-suse.patch, change + version to 3.0pre4-suse +- Rework on patch targetcli-refactor-fileio-backstore-creation.patch + to adapt version 3.0 pre4 API changes. + +------------------------------------------------------------------- Old: ---- 2.1.tar.gz targetcli-fix-exit.patch targetcli-git-update.patch New: ---- targetcli-3.0pre4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ targetcli.spec ++++++ --- /var/tmp/diff_new_pack.CQncUo/_old 2016-07-12 23:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CQncUo/_new 2016-07-12 23:52:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package targetcli # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,35 +20,25 @@ Summary: Generic SCSI target CLI shell License: Apache-2.0 Group: Applications/System -Version: 2.1 -Release: 0 -%define oname targetcli +Version: 3.0pre4 +Release: 1%{?dist} Url: http://www.github.com/Datera/targetcli -Source: https://github.com/Datera/%{oname}/archive/%{version}.tar.gz -Source1: %{oname}-systemd.service +Source: targetcli-3.0pre4.tar.gz +Source1: %{name}-systemd.service Source2: load_targetcli_config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: %{name}-fix-git-version-for-suse.patch +Patch3: %{name}-update-man-page-examples.patch +Patch5: %{name}-refactor-fileio-backstore-creation.patch Requires: lio-utils -Requires: python -Requires: python-configobj Requires: python-configshell Requires: python-prettytable Requires: python-rtslib > 2.2-2 -BuildRequires: epydoc -BuildRequires: python-configobj BuildRequires: python-configshell BuildRequires: python-devel BuildRequires: python-prettytable -BuildRequires: python-rtslib > 2.2-2 -%if 0%{?suse_version} >= 1230 -BuildRequires: systemd -%endif -%{?systemd_requires} -Patch1: %{oname}-git-update.patch -Patch2: %{oname}-fix-git-version-for-suse.patch -Patch3: %{oname}-update-man-page-examples.patch -Patch4: %{oname}-fix-exit.patch -Patch5: %{oname}-refactor-fileio-backstore-creation.patch +BuildRequires: python-rtslib +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description targetcli is an administration tool for managing storage targets @@ -56,30 +46,29 @@ The targetcli CLI is built on top of the python configshell CLI framework. %prep -%setup -q -n %{oname}-%{version} -%patch1 -p1 +%setup -q %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %build -%{__python} setup.py build +%__python setup.py build %install -%{__python} setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} -mkdir -p %{buildroot}%{_mandir}/man8 -mv doc/targetcli.8 %{buildroot}%{_mandir}/man8/targetcli.8 -gzip -9 %{buildroot}%{_mandir}/man8/targetcli.8 +python setup.py install --skip-build --root=%{buildroot} --prefix=usr +%__install -vd %{buildroot}%{_sysconfdir}/target +%__install -vd %{buildroot}%{_localstatedir}/target/pr +%__install -vd %{buildroot}%{_localstatedir}/target/alua +%__install -vd %{buildroot}/%{_mandir}/man8 +mkdir -p -m 0755 %{buildroot}%{_prefix}/sbin # install systemd service file -install -D -m 0644 %{S:1} %{buildroot}%{_unitdir}/targetcli.service +%__install -D -m 0644 %{S:1} %{buildroot}%{_unitdir}/targetcli.service +%__install doc/targetcli.8 %{buildroot}/%{_mandir}/man8 # create target config directory -install -d %{buildroot}/etc/target +%__install -d %{buildroot}/etc/target # install helper script to load config from file -install -D -m 0755 %{S:2} %{buildroot}%{_bindir} - -%clean -rm -rf %{buildroot} +%__install -D -m 0755 %{S:2} %{buildroot}%{_bindir} +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rctargetcli %post %{service_add_post targetcli.service} @@ -96,12 +85,15 @@ %files %defattr(-,root,root,-) %{python_sitelib} +%{_sysconfdir}/target +%{_localstatedir}/target %{_bindir}/targetcli %{_bindir}/targetcli-ng -%{_bindir}/load_targetcli_config +%{_mandir}/man8/* %doc COPYING README.md -%{_mandir}/man8/targetcli.8* +%{_bindir}/load_targetcli_config %{_unitdir}/targetcli.service +%{_sbindir}/rctargetcli %dir /etc/target %changelog ++++++ targetcli-fix-git-version-for-suse.patch ++++++ --- /var/tmp/diff_new_pack.CQncUo/_old 2016-07-12 23:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CQncUo/_new 2016-07-12 23:52:11.000000000 +0200 @@ -6,7 +6,7 @@ from ui_root import UIRoot -__version__ = 'GIT_VERSION' -+__version__ = '2.1-suse' ++__version__ = '3.0pre4-suse' __author__ = "Jerome Martin <[email protected]>" __url__ = "http://www.risingtidesystems.com"; __description__ = "An administration shell for RTS storage targets." ++++++ targetcli-refactor-fileio-backstore-creation.patch ++++++ --- /var/tmp/diff_new_pack.CQncUo/_old 2016-07-12 23:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CQncUo/_new 2016-07-12 23:52:11.000000000 +0200 @@ -1,22 +1,18 @@ -From: Lee Duncan <[email protected]> -Date: Sat Dec 12 14:11:48 PST 2015 -Subject: [PATCH] targetcli: refactor fileio backstore creation -Reference: bsc#920538 +From 7ed20d2041bb0492aebc6a5ff2a2f53ea407a199 Mon Sep 17 00:00:00 2001 +From: Zhu Lingshan <[email protected]> +Date: Fri, 4 Mar 2016 14:53:01 +0800 +Subject: [PATCH] fix -Allow creating fileio backstore with size supplied or not. The -logic here was a bit convoluted, so I refactored it to be more -readable and fixed a couple of corner cases in the process, such -as creating a file-based fileio backend with no size supplied, -in which case it should use the existing file's size. - -Signed-off-by: Lee Duncan <[email protected]> - - ui_backstore.py | 64 ++++++++++++++++++++++++++++---------------------------- - 1 file changed, 32 insertions(+), 32 deletions(-) +Signed-off-by: Zhu Lingshan <[email protected]> --- ---- targetcli-2.1.orig/targetcli/ui_backstore.py 2015-12-11 09:10:51.974495725 -0800 -+++ targetcli-2.1/targetcli/ui_backstore.py 2015-12-12 14:07:56.742991151 -0800 -@@ -318,31 +318,46 @@ class UIFileIOBackstore(UIBackstore): + targetcli/ui_backstore.py | 63 ++++++++++++++++++++++++----------------------- + 1 file changed, 32 insertions(+), 31 deletions(-) + +diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py +index 7fa75fc..7ce37e1 100644 +--- a/targetcli/ui_backstore.py ++++ b/targetcli/ui_backstore.py +@@ -307,29 +307,46 @@ class UIFileIOBackstore(UIBackstore): is_dev = get_block_type(file_or_dev) is not None \ or is_disk_partition(file_or_dev) @@ -32,11 +28,10 @@ try: - so = FileIOStorageObject( - backstore, name, file_or_dev, -- gen_wwn=self.prm_gen_wwn(generate_wwn), - buffered_mode=self.prm_buffered(buffered)) -+ so = FileIOStorageObject(backstore, name, file_or_dev, -+ gen_wwn=self.prm_gen_wwn(generate_wwn), -+ buffered_mode=self.prm_buffered(buffered)) ++ so = FileIOStorageObject(backstore, name, file_or_dev, ++ #gen_wwn=self.prm_gen_wwn(generate_wwn), ++ buffered_mode=self.prm_buffered(buffered)) except Exception, exception: backstore.delete() raise exception @@ -50,7 +45,7 @@ return self.new_node(ui_so) - elif size is not None and not is_dev: + elif is_file or no_exist: -+ # fileio backend to a file ++ # fileio backend to a file + if no_exist and size is None: + raise ExecutionError("Attempting to create file for new fileio backstore, need a size") + if size is not None: @@ -62,27 +57,25 @@ + actual_size = os.path.getsize(file_or_dev) + if size is not None and actual_size != num_size: + self.shell.log.info("%s exists, using its size (%d bytes) instead" % \ -+ (file_or_dev, actual_size)) ++ (file_or_dev, actual_size)) + size = str(actual_size) backstore = FileIOBackstore(self.next_hba_index(), mode='create') try: - so = FileIOStorageObject( - backstore, name, file_or_dev, - size, -- gen_wwn=self.prm_gen_wwn(generate_wwn), - buffered_mode=self.prm_buffered(buffered)) + so = FileIOStorageObject(backstore, name, file_or_dev, -+ size, -+ gen_wwn=self.prm_gen_wwn(generate_wwn), -+ buffered_mode=self.prm_buffered(buffered)) ++ size, ++ #gen_wwn=self.prm_gen_wwn(generate_wwn), ++ buffered_mode=self.prm_buffered(buffered)) except Exception, exception: backstore.delete() raise exception -@@ -350,23 +365,8 @@ class UIFileIOBackstore(UIBackstore): - ui_so = UIStorageObject(so, self) +@@ -338,24 +355,8 @@ class UIFileIOBackstore(UIBackstore): return self.new_node(ui_so) else: -- # use given file size only if backing file does not exist + # use given file size only if backing file does not exist - if os.path.isfile(file_or_dev): - new_size = str(os.path.getsize(file_or_dev)) - if size: @@ -99,8 +92,12 @@ - " fileio backstore, need a size") - self._create_file(file_or_dev, convert_human_to_bytes(size), - sparse) +- +- + raise ExecutionError("Path %s exists but is not a file or block device" % \ + file_or_dev) - - class UIIBlockBackstore(UIBackstore): + ''' + IBlock backstore UI. +-- +2.6.2
