Compare commits

..

No commits in common. "dd7e609882213463fe1f07b26a6e1da0e5c12be5" and "1dfe29f31267224388f8f0202942fd52a004db0d" have entirely different histories.

5 changed files with 5 additions and 46 deletions

View File

@ -1,28 +0,0 @@
From c13c9d3a90aec4779a0cbe484913f24bce947ab1 Mon Sep 17 00:00:00 2001
From: Wenchao Hao <haowenchao@huawei.com>
Date: Tue, 8 Jun 2021 16:26:04 +0800
Subject: [PATCH] Fix lsscsi wwn number output error
The true wwn number is from the sixth byte of scsi-*
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
src/lsscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lsscsi.c b/src/lsscsi.c
index 6f6953f..2be3ab9 100644
--- a/src/lsscsi.c
+++ b/src/lsscsi.c
@@ -1515,7 +1515,7 @@ collect_disk_wwn_nodes(void)
cur_ent = &cur_list->nodes[cur_list->count];
my_strcopy(cur_ent->wwn, "0x", 3);
- my_strcopy(cur_ent->wwn + 2, dep->d_name + 5,
+ my_strcopy(cur_ent->wwn + 2, dep->d_name + 6,
sizeof(cur_ent->wwn) - 2);
my_strcopy(cur_ent->disk_bname, basename(symlink_path),
sizeof(cur_ent->disk_bname));
--
1.8.3.1

BIN
lsscsi-0.30.tgz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,11 @@
Name: lsscsi Name: lsscsi
Version: 0.32 Version: 0.30
Release: 3 Release: 3
Summary: The lsscsi command lists information about SCSI devices in Linux. Summary: The lsscsi command lists information about SCSI devices in Linux.
License: GPLv2+ License: GPLv2+
URL: http://sg.danny.cz/scsi/lsscsi.html URL: http://sg.danny.cz/scsi/lsscsi.html
Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz
Patch1: 0001-Fix-lsscsi-wwn-number-output-error.patch
BuildRequires: gcc BuildRequires: gcc
%description %description
@ -26,7 +24,7 @@ Requires: man info
Man pages and other related documents for %{name}. Man pages and other related documents for %{name}.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-030r154 -p1
%build %build
%configure %configure
@ -43,21 +41,10 @@ Man pages and other related documents for %{name}.
%files help %files help
%{_mandir}/man8/%{name}.8* %{_mandir}/man8/%{name}.8*
%changelog %changelog
* Wed Jul 31 2024 JiangJianJun <jiangjianjun3@huawei.com> - 0.32-3
- DESC: fix spec format
* Tue Nov 1 2022 Wenchao Hao <haowenchao@huawei.com> - 0.32-2
- Remove macros in changelog
* Thu Nov 18 2021 Wenchao Hao <haowenchao@huawei.com> - 0.32-1
- Update to lsscsi-0.32
* Mon Aug 2 2021 Wenchao Hao <haowenchao@huawei.com> - 0.30-4
- DESC: fix incorrect output of wwn number when execute "lsscsi -w"
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.30-3 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.30-3
- DESC: delete -Sgit from autosetup, and delete BuildRequires git - DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Thu Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.30-2 * Thu Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.30-2
- Package init - Package init

View File

@ -1,5 +1,5 @@
version_control: github version_control: github
src_repo: doug-gilbert/lsscsi src_repo: hreinecke/lsscsi
tag_prefix: "^v" tag_prefix: "^v"
seperator: "." seperator: "."