Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
dd7e609882
!27 【轻量级 PR】:remove empty line lsscsi.spec
From: @cossbow 
Reviewed-by: @liubo254 
Signed-off-by: @liubo254
2024-08-01 02:49:17 +00:00
客串一回
f868529b09
remove empty line lsscsi.spec
https://gitee.com/src-openeuler/lsscsi/issues/IAGVSE

Signed-off-by: 客串一回 <cossbow@qq.com>
2024-07-31 10:07:27 +00:00
openeuler-ci-bot
0105d31393
!20 Remove macros in spec file's changelog
From: @wenchao-hao 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
2022-11-01 06:29:38 +00:00
Wenchao Hao
5685afa423 Remove macros in spec file's changelog
These macros such as %autosetup would be expanded while executing
rpm -q --changelog lsscsi which makes the output a mess. So we need
remove these macros in changelog.

Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
2022-11-01 10:25:00 +08:00
openeuler-ci-bot
451dfd75ce !18 Update yaml file
Merge pull request !18 from Wenchao Hao/master
2021-12-31 04:03:49 +00:00
Wenchao Hao
c185e598cd Update lsscsi.yaml to latest address
the mainline is changed to: https://github.com/doug-gilbert/lsscsi

Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
2021-11-23 22:18:02 +08:00
openeuler-ci-bot
abf3709d27 !17 Update to lsscsi-0.32
From: @wenchao-hao
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
2021-11-23 11:28:20 +00:00
Wenchao Hao
f15b237582 Update to lsscsi-0.32
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
2021-11-22 16:13:23 +08:00
openeuler-ci-bot
d3918f06a8 !9 Fix incorrect output of wwn number when execute "lsscsi -w"
From: @wenchao-hao
Reviewed-by: @markeryang,@liuzhiqiang26
Signed-off-by: @liuzhiqiang26
2021-08-06 06:48:44 +00:00
Wenchao Hao
4eb1f018b1 fix incorrect output of wwn number when execute "lsscsi -w"
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
2021-08-02 14:26:04 +08:00
5 changed files with 46 additions and 5 deletions

View File

@ -0,0 +1,28 @@
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

Binary file not shown.

BIN
lsscsi-0.32.tgz Normal file

Binary file not shown.

View File

@ -1,11 +1,13 @@
Name: lsscsi
Version: 0.30
Version: 0.32
Release: 3
Summary: The lsscsi command lists information about SCSI devices in Linux.
License: GPLv2+
URL: http://sg.danny.cz/scsi/lsscsi.html
Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz
Patch1: 0001-Fix-lsscsi-wwn-number-output-error.patch
BuildRequires: gcc
%description
@ -24,7 +26,7 @@ Requires: man info
Man pages and other related documents for %{name}.
%prep
%autosetup -n %{name}-030r154 -p1
%autosetup -n %{name}-%{version} -p1
%build
%configure
@ -41,10 +43,21 @@ Man pages and other related documents for %{name}.
%files help
%{_mandir}/man8/%{name}.8*
%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
- 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
- Package init

View File

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