Hello community, here is the log from the commit of package sg3_utils for openSUSE:Factory checked in at 2015-01-07 09:38:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sg3_utils (Old) and /work/SRC/openSUSE:Factory/.sg3_utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sg3_utils" Changes: -------- --- /work/SRC/openSUSE:Factory/sg3_utils/sg3_utils.changes 2014-09-09 18:59:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sg3_utils.new/sg3_utils.changes 2015-01-07 09:38:18.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 4 13:55:32 UTC 2015 - lnussel@suse.de + +- blacklist some usb controllers that don't like sg_inq (bnc#840054) + Add: sg3_utils-sg_inq-blacklist.diff + +------------------------------------------------------------------- New: ---- sg3_utils-sg_inq-blacklist.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sg3_utils.spec ++++++ --- /var/tmp/diff_new_pack.Y3cPl9/_old 2015-01-07 09:38:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Y3cPl9/_new 2015-01-07 09:38:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sg3_utils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -29,6 +29,7 @@ Patch0: sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch Patch1: sg3_utils-Fixup-formatting-of-invalid-VPD-page-0x83.patch Patch2: sg3_utils-Do-not-export-long-identifiers.patch +Patch3: sg3_utils-sg_inq-blacklist.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: udev BuildRequires: xz @@ -86,6 +87,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --disable-static --with-pic ++++++ sg3_utils-sg_inq-blacklist.diff ++++++ Index: sg3_utils-1.39/scripts/55-scsi-sg3_id.rules =================================================================== --- sg3_utils-1.39.orig/scripts/55-scsi-sg3_id.rules +++ sg3_utils-1.39/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}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA}" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org