Accepting request 360114 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/360114 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sg3_utils?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6f7c754e06
10
40-usb-blacklist.rules
Normal file
10
40-usb-blacklist.rules
Normal file
@ -0,0 +1,10 @@
|
||||
#
|
||||
# Blacklist specific USB devices
|
||||
#
|
||||
# don't inquire sn and di on broken devices (https://bugzilla.suse.com/show_bug.cgi?id=840054)
|
||||
|
||||
# unkown device
|
||||
ATTRS{idVendor}=="0aec", ATTRS{idProduct}=="3260", ENV{ID_SCSI_DI}="1"
|
||||
# Sony/JMicron port replicator
|
||||
ATTRS{idVendor}=="054c", ATTRS{idProduct}=="06a0", ENV{ID_SCSI_DI}="1"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6d7c9ec193dccae0838bc5afe22a1cfb2d0e66b3ff5845bf201271c10540e7ac
|
||||
size 752276
|
||||
3
sg3_utils-1.42.tar.xz
Normal file
3
sg3_utils-1.42.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:97aeed65894feb2add896b4adfa4cf343966c8a61c7d206795ed0507640ee7b9
|
||||
size 768876
|
||||
@ -1,12 +0,0 @@
|
||||
--- sg3_utils-1.41-orig/scripts/58-scsi-sg3_symlink.rules 2014-12-21 01:42:18.000000000 +0100
|
||||
+++ sg3_utils-1.41/scripts/58-scsi-sg3_symlink.rules 2015-10-05 12:26:23.774532127 +0200
|
||||
@@ -14,8 +14,7 @@
|
||||
# NAA identifier (prefix 3)
|
||||
# 1: IEEE Registered Extended first
|
||||
ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}"
|
||||
-ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition",
|
||||
-# SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
|
||||
+ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
|
||||
# 2: IEEE Registered
|
||||
ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}"
|
||||
ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}-part%n"
|
||||
@ -1,13 +0,0 @@
|
||||
Index: scripts/rescan-scsi-bus.sh
|
||||
===================================================================
|
||||
--- scripts/rescan-scsi-bus.sh.orig
|
||||
+++ scripts/rescan-scsi-bus.sh
|
||||
@@ -1183,7 +1183,7 @@ declare -i updated=0
|
||||
declare -i rmvd=0
|
||||
|
||||
if [ -n "$flush" ] ; then
|
||||
- if [-x $MULTIPATH ] ; then
|
||||
+ if [ -x $MULTIPATH ] ; then
|
||||
flushmpaths 1
|
||||
fi
|
||||
fi
|
||||
@ -1,26 +0,0 @@
|
||||
---
|
||||
scripts/55-scsi-sg3_id.rules | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
--- a/scripts/55-scsi-sg3_id.rules
|
||||
+++ b/scripts/55-scsi-sg3_id.rules
|
||||
@@ -15,10 +15,19 @@ ENV{SCSI_MODEL}=="?*", ENV{ID_MODEL}="$e
|
||||
ENV{SCSI_MODEL_ENC}=="?*", ENV{ID_MODEL_ENC}="$env{SCSI_MODEL_ENC}"
|
||||
ENV{SCSI_REVISION}=="?*", ENV{ID_REVISION}="$env{SCSI_REVISION}"
|
||||
ENV{SCSI_TYPE}=="?*", ENV{ID_TYPE}="$env{SCSI_TYPE}"
|
||||
+
|
||||
+# don't inquire sn and di on broken devices (https://bugzilla.suse.com/show_bug.cgi?id=840054)
|
||||
+# unkown device
|
||||
+ATTRS{idVendor}=="0aec", ATTRS{idProduct}=="3260", ENV{SG3_UTILS_DEVICE_IGNORE_SN_DI}="1"
|
||||
+# Sony/JMicron port replicator
|
||||
+ATTRS{idVendor}=="054c", ATTRS{idProduct}=="06a0", ENV{SG3_UTILS_DEVICE_IGNORE_SN_DI}="1"
|
||||
+
|
||||
+ENV{SG3_UTILS_DEVICE_IGNORE_SN_DI}=="1", GOTO="sg3_utils_sg_inq_sn_di_end"
|
||||
# SCSI EVPD page 0x80 values
|
||||
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode"
|
||||
# SCSI EVPD page 0x83 values
|
||||
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode"
|
||||
+LABEL="sg3_utils_sg_inq_sn_di_end"
|
||||
|
||||
# ID_WWN compat mapping
|
||||
ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA_REGEXT}"
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 18 09:41:03 CET 2016 - hare@suse.de
|
||||
|
||||
- Update to new upstream release 1.42:
|
||||
* sg_timestamp: new, to report or set timestamp
|
||||
* sg_read_attr: new, supported by tape drives
|
||||
* sg_stpg: fix truncation of target port field
|
||||
* sg_inq: cope with unicode strings, udev fixes
|
||||
- update version descriptor list to 20160125
|
||||
- '--export': new entries for UUID descriptor
|
||||
* sg_ses: add more field acronyms (ses3r11)
|
||||
8 sg_logs: add Utilization lpage (sbc4r07)
|
||||
- add Background operation lpage
|
||||
- add Pending defects lpage
|
||||
- add LPS misalignment lpage (sbc4r10)
|
||||
- document '--All' ('-A') option
|
||||
- rework lto tape vendor lpages
|
||||
* sg_vpd: add Block limits extension VPD page
|
||||
- add Device constituents VPD page
|
||||
- add LB Protection VPD page (ssc 15-296r1)
|
||||
- LB provisioning VPD page: expand LBPRZ, add
|
||||
Minimum and Threshold percentage fields
|
||||
- rework lto tape vendor VPD pages
|
||||
* sg_inq+sg_vpd+sg_xcopy: add support for locally
|
||||
assigned UUIDs in VPD page 0x83 (15-267r2)
|
||||
* sg_sanitize: add --znr option (sbc4r07)
|
||||
* sg_rep_zones: add --partial option (zbc-r04)
|
||||
* sg_format: add ffmt option (sbc4r10)
|
||||
- add support for FORMAT MEDIUM (for tape)
|
||||
* sg_raw: document length relationships
|
||||
* rescan-scsi-bus.sh: updates from Suse
|
||||
* sg_lib_data: sync asc/ascq codes with T10 20151126
|
||||
* sg_lib: add 'sense' categories for SCSI statuses:
|
||||
condition met, busy, task set full, ACA active and
|
||||
task aborted
|
||||
- add pr2serr() extern
|
||||
- change sg_get_sense_str() and dStrHexStr(), return
|
||||
chars written (returned void previously)
|
||||
- add sg_get_sense_descriptors_str() function
|
||||
- add sg_get_designation_descriptor_str() function
|
||||
- sg_get_desig_type_str()+sg_get_desig_assoc_str()
|
||||
and sg_get_desig_code_set_str() added
|
||||
- sg_get_opcode_sa_name() break out zoning in/out,
|
||||
read attribute and read position service actions
|
||||
* sg_cmds_extra: add sg_ll_format_unit2() for FFMT
|
||||
* sg_pr2serr.h: new, to shorten fprintf(stderr, ...)
|
||||
* sg_io_linux, sg_pt_linux: drop SUGGEST_* decoding
|
||||
* sg_unaligned.h: add 48 bit support and gets for
|
||||
variable length unsigned integers
|
||||
- Delete sg3_utils-sg_inq-blacklist.diff; solved differently
|
||||
- Added 40-usb-blacklist.rules (bsc#840054)
|
||||
- Delete sg3_utils-58-scsi-sg3_symlink-fixup.patch;
|
||||
merged with upstream
|
||||
- Delete sg3_utils-flush-fixup.patch; merged with upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 16 11:06:52 UTC 2015 - m4mnux@gmail.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package sg3_utils
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,8 +17,8 @@
|
||||
|
||||
|
||||
Name: sg3_utils
|
||||
%define lname libsgutils2-1_41-2
|
||||
Version: 1.41
|
||||
%define lname libsgutils2-1_42-2
|
||||
Version: 1.42
|
||||
Release: 0
|
||||
Summary: A collection of tools that send SCSI commands to devices
|
||||
License: GPL-2.0+ and BSD-3-Clause
|
||||
@ -26,11 +26,8 @@ Group: Hardware/Other
|
||||
Url: http://sg.danny.cz/sg/sg3_utils.html
|
||||
|
||||
Source: http://sg.danny.cz/sg/p/%name-%version.tar.xz
|
||||
Source1: 40-usb-blacklist.rules
|
||||
Patch1: sgut-libversioning.diff
|
||||
Patch3: sg3_utils-sg_inq-blacklist.diff
|
||||
# PATCH-FIX-UPSTREAM sg3_utils-58-scsi-sg3_symlink-fixup.patch boo#940833 boo#940834 boo#947947 zaitor@opensuse.org -- Fix broken line in script
|
||||
Patch4: sg3_utils-58-scsi-sg3_symlink-fixup.patch
|
||||
Patch5: sg3_utils-flush-fixup.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libtool
|
||||
BuildRequires: udev
|
||||
@ -87,9 +84,6 @@ applications that want to make use of libsgutils.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
@ -104,6 +98,7 @@ install -m 644 doc/rescan-scsi-bus.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
|
||||
install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}
|
||||
install -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir}
|
||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevrulesdir}
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%post -p /sbin/ldconfig -n %lname
|
||||
@ -122,6 +117,7 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%_bindir/scsi_logging_level
|
||||
%_bindir/rescan-scsi-bus.sh
|
||||
%_mandir/man8/*.8*
|
||||
%{_udevrulesdir}/40-usb-blacklist.rules
|
||||
%{_udevrulesdir}/55-scsi-sg3_id.rules
|
||||
%{_udevrulesdir}/58-scsi-sg3_symlink.rules
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user