upgrade to version 2.1.54
(cherry picked from commit 503562917978c72f413aed2360c594749c6709d6)
This commit is contained in:
parent
cd25baf000
commit
91dc75a38c
@ -1,21 +0,0 @@
|
||||
commit ed5ff9b9505e50b545e86dfbdd32077f0ddda0cb
|
||||
Author: Taylor Jakobson <tjakobs@us.ibm.com>
|
||||
Date: Thu Feb 1 14:44:32 2018 -0600
|
||||
|
||||
Use signed char instead of char
|
||||
|
||||
Python3 does not have the "character" type, use signed char instead.
|
||||
|
||||
diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
|
||||
index 3a2db10..5af448f 100644
|
||||
--- a/targetcli/ui_backstore.py
|
||||
+++ b/targetcli/ui_backstore.py
|
||||
@@ -536,7 +536,7 @@ class UIBlockBackstore(UIBackstore):
|
||||
except (OSError, IOError):
|
||||
raise ExecutionError("Could not open %s" % dev)
|
||||
# ioctl returns an int. Provision a buffer for it
|
||||
- buf = array.array('c', [chr(0)] * 4)
|
||||
+ buf = array.array('b', [0] * 4)
|
||||
try:
|
||||
fcntl.ioctl(f, BLKROGET, buf)
|
||||
except (OSError, IOError):
|
||||
@ -1,22 +0,0 @@
|
||||
From 598f988cb90e318a62a164cadb2045f4e6778bda Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Zakharov <pavel.zakharov@delphix.com>
|
||||
Date: Tue, 20 Feb 2018 17:53:20 -0500
|
||||
Subject: [PATCH] MappedLuns and Luns max number is not the same anymore
|
||||
|
||||
---
|
||||
targetcli/ui_target.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
|
||||
index 87c5a2a..6895b38 100644
|
||||
--- a/targetcli/ui_target.py
|
||||
+++ b/targetcli/ui_target.py
|
||||
@@ -1141,7 +1141,7 @@ def ui_command_create(self, storage_object, lun=None,
|
||||
existing_mluns = [mlun.mapped_lun for mlun in acl.mapped_luns]
|
||||
if mapped_lun in existing_mluns:
|
||||
mapped_lun = None
|
||||
- for possible_mlun in six.moves.range(LUN.MAX_LUN):
|
||||
+ for possible_mlun in six.moves.range(MappedLUN.MAX_LUN):
|
||||
if possible_mlun not in existing_mluns:
|
||||
mapped_lun = possible_mlun
|
||||
break
|
||||
@ -1,12 +1,10 @@
|
||||
Name: targetcli
|
||||
Version: 2.1.fb48
|
||||
Release: 11
|
||||
Version: 2.1.54
|
||||
Release: 1
|
||||
License: ASL 2.0
|
||||
Summary: Generic SCSI target CLI shell
|
||||
URL: https://github.com/open-iscsi/targetcli-fb
|
||||
Source: https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz
|
||||
Patch0000: 0000-signed-char.patch
|
||||
Patch0001: MappedLuns-and-Luns-max-number-is-not-the-same-anymore.patch
|
||||
Source: https://github.com/open-iscsi/targetcli-fb/archive/v2.1.54.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3-devel python3-setuptools
|
||||
Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject %{name}-help
|
||||
@ -37,6 +35,7 @@ install -D -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/targetcli.8.gz
|
||||
%doc COPYING README.md
|
||||
%{python3_sitelib}/*
|
||||
%{_bindir}/targetcli
|
||||
%{_bindir}/targetclid
|
||||
%dir %{_sysconfdir}/target
|
||||
%dir %{_sysconfdir}/target/backup
|
||||
|
||||
@ -44,6 +43,9 @@ install -D -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/targetcli.8.gz
|
||||
%{_mandir}/man8/targetcli.8.gz
|
||||
|
||||
%changelog
|
||||
* Fri Jul 29 2022 zhuhai <zhuhai@ncti-gba.cn> - 2.1.54-1
|
||||
- upgrade to version 2.1.54
|
||||
|
||||
* Mon Nov 09 2020 liuweibo <liuweibo10@huawei.com> - 2.1.fb48-11
|
||||
- append help requires to targetcli
|
||||
|
||||
|
||||
BIN
v2.1.54.tar.gz
Normal file
BIN
v2.1.54.tar.gz
Normal file
Binary file not shown.
BIN
v2.1.fb48.tar.gz
BIN
v2.1.fb48.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user