Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
5a8b5cc680
!23 [sync] PR-20: Remove macros in spec file's changelog
From: @openeuler-sync-bot 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
2022-11-01 07:07:27 +00:00
Wenchao Hao
fb61e115d1 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>
(cherry picked from commit 5685afa42373be1e7f1e83b6c4c442cfae2a9c59)
2022-11-01 14:29:51 +08:00
openeuler-ci-bot
05a3f8de8f !19 [sync] PR-17: Update to lsscsi-0.32
From: @openeuler-sync-bot
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
2021-11-29 02:41:26 +00:00
Wenchao Hao
3731bd63cf Update to lsscsi-0.32
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
(cherry picked from commit f15b237582942407bc6ea7beb39ed08da61b3861)
2021-11-29 09:40:16 +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
openeuler-ci-bot
1dfe29f312 !2 lsscsi delete -Sgit from %autosetup, and delete BuildRequires git
From: @chenyanpanHW
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
2021-07-31 01:39:18 +00:00
chenyanpanHW
1e778e04ac
delete -Sgit from %autosetup, and delete BuildRequires git 2021-07-30 23:05:57 +08:00
openeuler-ci-bot
0cfc625141 !1 add yaml file in package
Merge pull request !1 from maqiang/master
2020-06-23 16:48:24 +08:00
maqiang999
bde5d03f02 add yaml file in package 2020-06-13 13:39:16 +08:00
5 changed files with 49 additions and 3 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,13 +1,14 @@
Name: lsscsi
Version: 0.30
Version: 0.32
Release: 2
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
BuildRequires: git
%description
Using SCSI terminology, lsscsi lists SCSI logical units (or SCSI targets
@ -25,7 +26,7 @@ Requires: man info
Man pages and other related documents for %{name}.
%prep
%autosetup -n %{name}-030r154 -p1 -Sgit
%autosetup -n %{name}-%{version} -p1
%build
%configure
@ -44,5 +45,17 @@ Man pages and other related documents for %{name}.
%changelog
* 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
* Thu Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.30-2
- Package init

5
lsscsi.yaml Normal file
View File

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