diff --git a/fix-mapping-the-new-LUN-to-the-node-ACL.patch b/fix-mapping-the-new-LUN-to-the-node-ACL.patch deleted file mode 100644 index c9ec38a6040346396a18ce9f5b769d010201a6b6..0000000000000000000000000000000000000000 --- a/fix-mapping-the-new-LUN-to-the-node-ACL.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 560993168d85ec7c84e9aacba5659aa17b40588c Mon Sep 17 00:00:00 2001 -From: Maurizio Lombardi -Date: Tue, 30 Jan 2024 13:03:08 +0100 -Subject: [PATCH] Fix mapping the new LUN to the node ACL - -Signed-off-by: Maurizio Lombardi - ---- - targetcli/ui_target.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py -index 2c46765..56f5419 100644 ---- a/targetcli/ui_target.py -+++ b/targetcli/ui_target.py -@@ -1151,9 +1151,8 @@ class UILUNs(UINode): - possible_mlun += 1 - mapped_lun = possible_mlun - -- else: -- mlun = MappedLUN(acl, mapped_lun, lun_object, write_protect=False) -- self.shell.log.info("Created LUN %d->%d mapping in node ACL %s" -+ mlun = MappedLUN(acl, mapped_lun, lun_object, write_protect=False) -+ self.shell.log.info("Created LUN %d->%d mapping in node ACL %s" - % (mlun.tpg_lun.lun, mlun.mapped_lun, acl.node_wwn)) - self.parent.refresh() - --- -2.27.0 - diff --git a/remove-reference-to-MAX_LUN.patch b/remove-reference-to-MAX_LUN.patch deleted file mode 100644 index 26b7f758eca811e16c8f22d1dae4b2a63af5c272..0000000000000000000000000000000000000000 --- a/remove-reference-to-MAX_LUN.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4424eba4ba9f5c66c0cd8691fd4aad87ee19640f Mon Sep 17 00:00:00 2001 -From: Maurizio Lombardi -Date: Thu, 19 Oct 2023 14:15:54 +0200 -Subject: [PATCH] target: remove the reference to MAX_LUN - -The MappedLUN.MAX_LUN symbol has been removed from rtslib. -Remove the reference to it. - -Signed-off-by: Maurizio Lombardi - ---- - targetcli/ui_target.py | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py -index e8ba6c6..2c46765 100644 ---- a/targetcli/ui_target.py -+++ b/targetcli/ui_target.py -@@ -1146,16 +1146,11 @@ class UILUNs(UINode): - mapped_lun = 0 - 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(MappedLUN.MAX_LUN): -- if possible_mlun not in existing_mluns: -- mapped_lun = possible_mlun -- break -- -- if mapped_lun == None: -- self.shell.log.warning( -- "Cannot map new lun %s into ACL %s" -- % (lun_object.lun, acl.node_wwn)) -+ possible_mlun = 0 -+ while possible_mlun in existing_mluns: -+ possible_mlun += 1 -+ mapped_lun = possible_mlun -+ - else: - mlun = MappedLUN(acl, mapped_lun, lun_object, write_protect=False) - self.shell.log.info("Created LUN %d->%d mapping in node ACL %s" --- -2.27.0 - diff --git a/targetcli-fb-2.1.56.tar.gz b/targetcli-fb-2.1.56.tar.gz deleted file mode 100644 index 7d569b9bf0d33fcd10ef36b114c2abafc255ac0a..0000000000000000000000000000000000000000 Binary files a/targetcli-fb-2.1.56.tar.gz and /dev/null differ diff --git a/targetcli-fb-2.1.58.tar.gz b/targetcli-fb-2.1.58.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..caeb7d7c9bf9dd1ec5876dc9b09016a45ed58142 Binary files /dev/null and b/targetcli-fb-2.1.58.tar.gz differ diff --git a/targetcli.spec b/targetcli.spec index da95896c23dc549cc7d283ad6e59150e64b91771..41f88a95a70cb8afdcfef9cb3837828c7c36033a 100644 --- a/targetcli.spec +++ b/targetcli.spec @@ -1,12 +1,11 @@ Name: targetcli License: ASL 2.0 Summary: Generic SCSI target CLI shell -Version: 2.1.56 -Release: 3 +Version: 2.1.58 +Release: 1 URL: https://github.com/open-iscsi/targetcli-fb Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz -Patch01: remove-reference-to-MAX_LUN.patch -Patch02: fix-mapping-the-new-LUN-to-the-node-ACL.patch + BuildArch: noarch BuildRequires: python3-devel python3-setuptools systemd Requires: python3-rtslib target-restore python3-configshell python3-six python3-dbus python3-gobject-base @@ -49,6 +48,11 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/ %{_mandir}/man8/targetcli*.8* %changelog +* Wed Jul 03 2024 xu_ping <707078654@qq.com> - 2.1.58-1 +- Upgrade version to 2.1.58 +- Fix mapping the new LUN to the node ACL. +- remove the reference to MAX_LUN. + * Mon May 13 2024 yanshuai - 2.1.56-3 - fix mapping the new LUN to the node ACL