已合并
Fix version mismatch between targetcli-fb and rtslib-fb #36
wang--ge创建于 20 天前
Fix version mismatch between targetcli-fb and rtslib-fb #36
已合并
共 2 个文件变更+21-1
| @@ -0,0 +1,16 @@ | |||
| 1 | +Refer: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1145850 | ||
| 2 | + | ||
| 3 | +diff --git a/src/targetcli/ui_backstore.py b/src/targetcli/ui_backstore.py | ||
| 4 | +index 6172980..f4f8f36 100644 | ||
| 5 | +--- a/src/targetcli/ui_backstore.py | ||
| 6 | ++++ b/src/targetcli/ui_backstore.py | ||
| 7 | + class UIBlockBackstore(UIBackstore): | ||
| 8 | + excl_string = self.ui_eval_param(exclusive, 'string', None) | ||
| 9 | + exclusive = True if excl_string is None else self.ui_eval_param(exclusive, "bool", True) | ||
| 10 | + | ||
| 11 | +- so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn, | ||
| 12 | +- exclusive=exclusive) | ||
| 13 | ++ so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn) | ||
| 14 | + ui_so = UIBlockStorageObject(so, self) | ||
| 15 | + self.setup_model_alias(so) | ||
| 16 | + self.shell.log.info(f"Created block storage object {name} using {dev}.") | ||
| @@ -2,13 +2,14 @@ Name: targetcli | |||
| 2 | License: Apache-2.0 | 2 | License: Apache-2.0 |
| 3 | Summary: Generic SCSI target CLI shell | 3 | Summary: Generic SCSI target CLI shell |
| 4 | Version: 3.0.2 | 4 | Version: 3.0.2 |
| 5 | -Release: 2 | 5 | +Release: 3 |
| 6 | URL: https://github.com/open-iscsi/targetcli-fb | 6 | URL: https://github.com/open-iscsi/targetcli-fb |
| 7 | Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz | 7 | Source: https://github.com/open-iscsi/targetcli-fb/archive/v%{version}/targetcli-fb-%{version}.tar.gz |
| 8 | 8 | ||
| 9 | BuildArch: noarch | 9 | BuildArch: noarch |
| 10 | 10 | ||
| 11 | Patch0: Fix-signal_handler-signature-to-accept-required-sign.patch | 11 | Patch0: Fix-signal_handler-signature-to-accept-required-sign.patch |
| 12 | +Patch1: Fix-version-mismatch-between-targetcli-fb-and-rtslib-fb.patch | ||
| 12 | 13 | ||
| 13 | BuildRequires: python3-devel python3-setuptools systemd | 14 | BuildRequires: python3-devel python3-setuptools systemd |
| 14 | BuildRequires: python3-pip python3-wheel | 15 | BuildRequires: python3-pip python3-wheel |
| @@ -54,6 +55,9 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/ | |||
| 54 | %{_mandir}/man8/targetcli*.8* | 55 | %{_mandir}/man8/targetcli*.8* |
| 55 | 56 | ||
| 56 | %changelog | 57 | %changelog |
| 58 | +* Thu Sep 17 2026 Ge Wang <wang__ge@126.com> - 3.0.2-3 | ||
| 59 | +- Fix version mismatch between targetcli-fb and rtslib-fb | ||
| 60 | + | ||
| 57 | * Tue Aug 18 2026 xu_ping <707078654@qq.com> - 3.0.2-2 | 61 | * Tue Aug 18 2026 xu_ping <707078654@qq.com> - 3.0.2-2 |
| 58 | - fix targetclid service stop failed. | 62 | - fix targetclid service stop failed. |
| 59 | 63 | ||