Accepting request 229719 from home:hreinecke:branches:Base:System

- Split off 59-scsi-sg_utils.rules to properly support multipathing (bnc#873151) Remove: 0001-59-scsi-sg_utils.rules-skip-symlinks-for-multipath-d.patch Add: 0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch - Update to official release 1.38 * Update documentation * Update to latest SPC * Minor fixes * Add: sg3_utils-1.38.tar.xz * Remove: sg3_utils-1.38b7r538.tar.xz * Remove: sg3_utils-1.38r546.patch * Remove: sg3_utils-1.38b12r556.patch - Use 59-scsi-sg3_utils from the rpm Remove: 59-scsi-sg3_utils.rules - Fixup 59-scsi-sg3_utils.rules to not provide symlinks on multipath device paths (bnc#872929) Add: 0001-59-scsi-sg_utils.rules-skip-symlinks-for-multipath-d.patch - Fixup 59-scsi_sg3_utils.rules to provide compability links for ata_id (bnc#866933) - Add 59-scsi-sg3_utils.rules (bnc#865494) - Update to inofficial release 1.38b12r556 (bnc#865494) * Add --inhex parameter to sg_inq * sg_inq: decode ASCII information vpd page * sg_inq: allow page=-1 to force std INQUIRY decoding OBS-URL: https://build.opensuse.org/request/show/229719 OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=33
2014-04-12 21:29:53 +00:00 · 2014-04-12 21:29:53 +00:00 · 1ccb58cb91
commit 1ccb58cb91
parent 7c9ef8f1f7
6 changed files with 265 additions and 37 deletions
--- a/0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch
+++ b/0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch
@ -0,0 +1,162 @@
+From fbae79a402a00ab9c228a31fd800f524d57960fe Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 10 Apr 2014 11:18:44 +0200
+Subject: [PATCH] Split 59-scsi-sg_utils.rules for multipath support
+
+The current rules file combines the setting of environment
+variables and the generation of persistent symlinks.
+The causes issues with multipathing, as multipath needs to have
+access to the WWID to be able to decide if the device should be
+handled by multipath (and hence no symlinks should be created)
+or not (and udev can proceed with creating symlinks).
+So this patch splits off the rules file in two sections,
+55-scsi-sg3_id.rules and 58-scsi-sg3_symlink.rules.
+This allows multipath rules to be inserted between them
+to make the correct decision.
+
+References: bnc#873151
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+---
+ scripts/55-scsi-sg3_id.rules      | 35 ++++++++++++++++++++++++++++
+ scripts/58-scsi-sg3_symlink.rules | 29 +++++++++++++++++++++++
+ scripts/59-scsi-sg3_utils.rules   | 49 ---------------------------------------
+ 3 files changed, 64 insertions(+), 49 deletions(-)
+ create mode 100644 scripts/55-scsi-sg3_id.rules
+ create mode 100644 scripts/58-scsi-sg3_symlink.rules
+ delete mode 100644 scripts/59-scsi-sg3_utils.rules
+
+diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules
+new file mode 100644
+index 0000000..2f99157
+--- /dev/null
+++ b/scripts/55-scsi-sg3_id.rules
+@@ -0,0 +1,35 @@
+# SCSI-ID mappings for sg3_utils
+
+ACTION=="remove", GOTO="sg3_utils_id_end"
+
+SUBSYSTEM!="block", GOTO="sg3_utils_id_end"
+
+# Import values for partitions
+ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_*", ENV{ID_SCSI}="1"
+# SCSI INQUIRY values
+KERNEL=="sd*[!0-9]|sr*", IMPORT{program}="/usr/bin/sg_inq --export $tempnode", ENV{ID_SCSI}="1"
+# scsi_id compat mappings
+ENV{SCSI_VENDOR}=="?*", ENV{ID_VENDOR}="$env{SCSI_VENDOR}"
+ENV{SCSI_VENDOR_ENC}=="?*", ENV{ID_VENDOR_ENC}="$env{SCSI_VENDOR_ENC}"
+ENV{SCSI_MODEL}=="?*", ENV{ID_MODEL}="$env{SCSI_MODEL}"
+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}"
+# 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"
+
+# ID_WWN compat mapping
+ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA}"
+ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_WWN_WITH_EXTENSION}!="?*", ENV{ID_WWN_WITH_EXTENSION}="0x$env{SCSI_IDENT_LUN_NAA}"
+
+# ata_id compability
+ENV{ID_SERIAL}!="?*", ENV{SCSI_VENDOR}=="ATA", ENV{ID_BUS}="ata", ENV{ID_ATA}="1", ENV{ID_SERIAL}="$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}"
+# Compat ID_SERIAL setting
+ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="3$env{SCSI_IDENT_LUN_NAA}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_NAA}"
+ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="2$env{SCSI_IDENT_LUN_EUI64}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_EUI64}"
+ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="8$env{SCSI_IDENT_LUN_NAME}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_NAME}"
+ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="1$env{SCSI_IDENT_LUN_T10}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_T10}"
+ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_VENDOR}"
+LABEL="sg3_utils_id_end"
+diff --git a/scripts/58-scsi-sg3_symlink.rules b/scripts/58-scsi-sg3_symlink.rules
+new file mode 100644
+index 0000000..a95cbcb
+--- /dev/null
+++ b/scripts/58-scsi-sg3_symlink.rules
+@@ -0,0 +1,29 @@
+# SCSI-ID symlinks for sg3_utils
+
+ACTION=="remove", GOTO="sg3_utils_symlink_end"
+
+SUBSYSTEM!="block", GOTO="sg3_utils_symlink_end"
+
+# Skip symlink generation for multipath
+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="sg3_utils_symlink_end"
+
+# Select which identifier to use per default
+# 0: vpd page 0x80 identifier
+ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}"
+# 1: NAA identifier (prefix 3)
+ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}"
+ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}-part%n"
+# 2: EUI-64 identifer (prefix 2)
+ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-2$env{SCSI_IDENT_LUN_EUI64}"
+ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-2$env{SCSI_IDENT_LUN_EUI64}-part%n"
+# 3: SCSI name identifier (prefix 8)
+ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-8$env{SCSI_IDENT_LUN_NAME}"
+ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-8$env{SCSI_IDENT_LUN_NAME}-part%n"
+# 4: T10 Vendor identifer (prefix 1)
+ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}"
+ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}-part%n"
+# 5: Vendor-specific identifier (prefix 0)
+ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}"
+ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}-part%n"
+
+LABEL="sg3_utils_symlink_end"
+diff --git a/scripts/59-scsi-sg3_utils.rules b/scripts/59-scsi-sg3_utils.rules
+deleted file mode 100644
+index 71a3df0..0000000
+--- a/scripts/59-scsi-sg3_utils.rules
+++ /dev/null
+@@ -1,49 +0,0 @@
+-# SCSI-ID mappings for sg3_utils
+-
+-ACTION=="remove", GOTO="sg3_utils_end"
+-
+-SUBSYSTEM!="block", GOTO="sg3_utils_end"
+-
+-# Import values for partitions
+-ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_*", ENV{ID_SCSI}="1"
+-# SCSI INQUIRY values
+-KERNEL=="sd*[!0-9]|sr*", IMPORT{program}="/usr/bin/sg_inq --export $tempnode", ENV{ID_SCSI}="1"
+-# scsi_id compat mappings
+-ENV{SCSI_VENDOR}=="?*", ENV{ID_VENDOR}="$env{SCSI_VENDOR}"
+-ENV{SCSI_VENDOR_ENC}=="?*", ENV{ID_VENDOR_ENC}="$env{SCSI_VENDOR_ENC}"
+-ENV{SCSI_MODEL}=="?*", ENV{ID_MODEL}="$env{SCSI_MODEL}"
+-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}"
+-# SCSI EVPD page 0x80 values
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode"
+-ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}"
+-# SCSI EVPD page 0x83 values
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode"
+-# Select which identifier to use per default
+-# 1: NAA identifier (prefix 3)
+-ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}"
+-ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}-part%n"
+-ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA}"
+-ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_WWN_WITH_EXTENSION}!="?*", ENV{ID_WWN_WITH_EXTENSION}="0x$env{SCSI_IDENT_LUN_NAA}"
+-# 2: EUI-64 identifer (prefix 2)
+-ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-2$env{SCSI_IDENT_LUN_EUI64}"
+-ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-2$env{SCSI_IDENT_LUN_EUI64}-part%n"
+-# 3: SCSI name identifier (prefix 8)
+-ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-8$env{SCSI_IDENT_LUN_NAME}"
+-ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-8$env{SCSI_IDENT_LUN_NAME}-part%n"
+-# 4: T10 Vendor identifer (prefix 1)
+-ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}"
+-ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}-part%n"
+-# 5: Vendor-specific identifier (prefix 0)
+-ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}"
+-ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}-part%n"
+-# ata_id compability
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_VENDOR}=="ATA", ENV{ID_BUS}="ata", ENV{ID_ATA}="1", ENV{ID_SERIAL}="$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}"
+-# Compat ID_SERIAL setting
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="3$env{SCSI_IDENT_LUN_NAA}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_NAA}"
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_EUI64}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="2$env{SCSI_IDENT_LUN_EUI64}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_EUI64}"
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_NAME}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="8$env{SCSI_IDENT_LUN_NAME}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_NAME}"
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_T10}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="1$env{SCSI_IDENT_LUN_T10}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_T10}"
+-ENV{ID_SERIAL}!="?*", ENV{SCSI_IDENT_LUN_VENDOR}=="?*", ENV{ID_BUS}="scsi", ENV{ID_SERIAL}="0$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_LUN_VENDOR}", ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_LUN_VENDOR}"
+-LABEL="sg3_utils_end"
+-- 
+1.8.1.4
+
--- a/sg3_utils-1.37.tar.xz
+++ b/sg3_utils-1.37.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bbf198bc58b49e853cfd1a9aca0d405716173c1d083a690aa09b243afca5e5c
-size 673112
--- a/sg3_utils-1.38.tar.xz
+++ b/sg3_utils-1.38.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5fc292c74fdefc74de92f39f0f741f8c389ab8d3fa699fd8eee0751119d132b
+size 694804
--- a/sg3_utils-check-if-hba-supports-issue-lip.patch
+++ b/sg3_utils-check-if-hba-supports-issue-lip.patch
@ -1,23 +0,0 @@
-From: ohering@suse.de
-Date: 2013-08-25 18:45:14 +0200
-References: http://bugzilla.novell.com/780946
-
-(was originally marked to fix an upstream issue, but no description
-was provided)
-
-Index: sg3_utils-1.35/scripts/rescan-scsi-bus.sh
-===================================================================
--- sg3_utils-1.35.orig/scripts/rescan-scsi-bus.sh
-+++ sg3_utils-1.35/scripts/rescan-scsi-bus.sh
-@@ -750,8 +750,9 @@ for host in $hosts; do
-   echo -n "Scanning host $host "
-   if test -e /sys/class/fc_host/host$host ; then
-     # It's pointless to do a target scan on FC
-    if test -n "$lipreset" ; then
-      echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null;
-+    issue_lip=/sys/class/fc_host/host$host/issue_lip
-+    if test -e $issue_lip -a -n "$lipreset" ; then
-+      echo 1 > $issue_lip 2> /dev/null;
-       udevadm_settle
-     fi
-     channelsearch=
--- a/sg3_utils.changes
+++ b/sg3_utils.changes
@ -1,3 +1,85 @@
+-------------------------------------------------------------------
+Fri Apr 11 12:12:47 CEST 2014 - hare@suse.de
+
+- Split off 59-scsi-sg_utils.rules to properly support
+  multipathing (bnc#873151)
+  Remove:
+  0001-59-scsi-sg_utils.rules-skip-symlinks-for-multipath-d.patch
+  Add:
+  0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch
+
+-------------------------------------------------------------------
+Thu Apr 10 11:22:07 CEST 2014 - hare@suse.de
+
+- Update to official release 1.38
+  * Update documentation
+  * Update to latest SPC
+  * Minor fixes
+  * Add: sg3_utils-1.38.tar.xz
+  * Remove: sg3_utils-1.38b7r538.tar.xz
+  * Remove: sg3_utils-1.38r546.patch
+  * Remove: sg3_utils-1.38b12r556.patch
+- Use 59-scsi-sg3_utils from the rpm
+  Remove: 59-scsi-sg3_utils.rules
+- Fixup 59-scsi-sg3_utils.rules to not provide symlinks
+  on multipath device paths (bnc#872929)
+  Add: 0001-59-scsi-sg_utils.rules-skip-symlinks-for-multipath-d.patch
+
+-------------------------------------------------------------------
+Fri Mar  7 11:44:33 CET 2014 - hare@suse.de
+
+- Fixup 59-scsi_sg3_utils.rules to provide compability links
+  for ata_id (bnc#866933)
+
+-------------------------------------------------------------------
+Fri Feb 28 15:15:32 CET 2014 - hare@suse.de
+
+- Add 59-scsi-sg3_utils.rules (bnc#865494)
+
+-------------------------------------------------------------------
+Tue Feb 25 11:26:24 CET 2014 - hare@suse.de
+
+- Update to inofficial release 1.38b12r556 (bnc#865494)
+  * Add --inhex parameter to sg_inq
+  * sg_inq: decode ASCII information vpd page
+  * sg_inq: allow page=-1 to force std INQUIRY decoding
+  * sg_inq: improve unit serial number display
+  * sg_vpd: Add LTO and DDS vendor pages
+  * sg_persist: add SOP transport ID
+  * sg_lib_data: sync asc/ascq code with T10
+  * rescan-scsi-bus.sh: check if FC driver exports issue_lip
+  * Add man page for rescan-scsi-bus.sh
+- Remove sg3_utils-check-if-hba-supports-issue-lip.patch,
+  has been merged with upstream
+
+-------------------------------------------------------------------
+Thu Jan 23 08:57:56 CET 2014 - hare@suse.de
+
+- Update to inofficial release 1.38r546 (bnc#831778)
+  * sg_ses: error and warning message cleanup
+    - fix --data=- problem with large buffers
+    - new --data=@FN to read hex data from file FN
+    - add --maxlen= option
+  * sg_inq:
+    - add LU_CONG to standard inquiry response
+    - sync version descriptors dated 20131126
+    - fix overflow in encode_whitespaces
+  * sg_vpd: add LU_CONG to standard inquiry response output
+    - decode Third Party Copy (tpc) page
+  * sg_persist: add PROUT: Replace Lost Reservation (spc4r36)
+  * sg_readcap: for --16 show physical block size if
+  * sg_xcopy:
+    - environment variables: XCOPY_TO_SRC and
+      XCOPY_TO_DST indicate where xcopy command is sent
+    - change default to send xcopy to dst (was src)
+    - improve CL handling of short options (e.g. '-vv')
+  * sg_write_same: repeat if unit attention
+  * sg_rtpg: fix indexing bug with --extended option
+  * sg_lib_data: sync asc/ascq codes with T10 dated 20131110
+  * sg_cmds_extra: fix sa bug in sg_ll_3party_copy_out()
+- Update tarball to 1.38b7r537
+- Add sg3_utils-1.38r546.patch
+
 -------------------------------------------------------------------
 Mon Nov  4 01:59:38 UTC 2013 - jengelh@inai.de

@ -56,7 +138,7 @@ Tue Jun 11 08:56:39 UTC 2013 - rmilasan@suse.com
  - sg_lib: improve snprintf handling
  - sg_lib_data: sync asc/ascq codes with T10 20130117
  - sg_cmds (lib): if noisy given, give more UA info
-  - make code more C++ friendly 
+  - make code more C++ friendly

 -------------------------------------------------------------------
 Tue Mar 12 09:13:45 CET 2013 - hare@suse.de
@ -115,7 +197,7 @@ Wed Jul  4 07:01:46 UTC 2012 - cfarrell@suse.com
 -------------------------------------------------------------------
 Sun Apr 22 11:50:44 UTC 2012 - puzel@suse.com

- Update to version 1.33 
+- Update to version 1.33
  - sg_ses: major rework of indexes (again), now two level
  - sg_write_buffer: new --specific option for mode specific
    field; new mode 13 (spc4r32)
@ -287,7 +369,7 @@ Tue Jul 21 14:00:16 CEST 2009 - hare@suse.de
 -------------------------------------------------------------------
 Fri Apr 17 20:15:58 CEST 2009 - crrodriguez@suse.de

- remove static libraries and "la" files 
+- remove static libraries and "la" files

 -------------------------------------------------------------------
 Mon Jan 26 15:30:31 CET 2009 - hare@suse.de
@ -316,7 +398,7 @@ Fri Sep 12 20:29:08 CEST 2008 - garloff@suse.de
 - Update rescan-scsi-bus.sh script to 1.28:
  * Merge fixes from Hannes
  * Minor cleanups
-  * Sort hosts numerically 
+  * Sort hosts numerically

 -------------------------------------------------------------------
 Tue Aug 12 18:25:43 CEST 2008 - garloff@suse.de
@ -328,7 +410,7 @@ Tue Aug 12 18:25:43 CEST 2008 - garloff@suse.de
 - Update to sg3_utils-1.26:
  * Minor fixes and enhancements to
    sg_sat_phy_event, sg_ses, sg_get_config, sg_verify, sg_vpd,
-    sg_inq, sg_modes, sg_start, sg_request, sg_luns, sg_dd, 
+    sg_inq, sg_modes, sg_start, sg_request, sg_luns, sg_dd,
    sg_opcodes, sg_turs.
  * sg_lib: asc/ascq update for spc4r15, osd2r03 service actions,
    sense key specific unit attn queue overflow decoding, ...
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@ -1,7 +1,7 @@
 #
 # spec file for package sg3_utils
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -18,16 +18,17 @@

 Name:           sg3_utils
 %define lname	libsgutils2-2
-Version:        1.37
+Version:        1.38
 Release:        0
 Summary:        A collection of tools that send SCSI commands to devices
 License:        GPL-2.0+ and BSD-3-Clause
 Group:          Hardware/Other
 Url:            http://sg.danny.cz/sg/sg3_utils.html

-Source:         http://sg.danny.cz/sg/p/%name-%version.tar.xz
-Patch1:         sg3_utils-check-if-hba-supports-issue-lip.patch
+Source:         http://sg.danny.cz/sg/p/%name-%{version}.tar.xz
+Patch1:         0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  udev
 BuildRequires:  xz
 Requires(pre):  %insserv_prereq
 Provides:       scsi
@ -79,7 +80,7 @@ This subpackage contains libraries and header files for developing
 applications that want to make use of libsgutils.

 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch1 -p1

 %build
@ -90,6 +91,10 @@ make %{?_smp_mflags}
 make install DESTDIR="%buildroot"
 install -m 755 scripts/scsi_logging_level $RPM_BUILD_ROOT%{_bindir}
 install -m 755 scripts/rescan-scsi-bus.sh $RPM_BUILD_ROOT%{_bindir}
+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}
 %{__rm} -f %{buildroot}%{_libdir}/*.la

 %post   -p /sbin/ldconfig -n %lname
@ -98,7 +103,7 @@ install -m 755 scripts/rescan-scsi-bus.sh $RPM_BUILD_ROOT%{_bindir}

 %files
 %defattr(-,root,root)
-%doc README README.sg_start 
+%doc README README.sg_start
 %doc ChangeLog CREDITS NEWS
 %_bindir/sg_*
 %_bindir/scsi_*
@ -108,6 +113,8 @@ install -m 755 scripts/rescan-scsi-bus.sh $RPM_BUILD_ROOT%{_bindir}
 %_bindir/scsi_logging_level
 %_bindir/rescan-scsi-bus.sh
 %_mandir/man8/*.8*
+%{_udevrulesdir}/55-scsi-sg3_id.rules
+%{_udevrulesdir}/58-scsi-sg3_symlink.rules

 %files -n %lname
 %defattr(-,root,root)