From 61466b1840c8eeeba1d00dce760d85d1655f95e4 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 8 Nov 2024 00:49:39 +0300 Subject: [PATCH] import sg3_utils-1.48-7.el10 --- ...purious_warning_for_non-SCSI_devices.patch | 29 +++++++++++++++++++ SPECS/sg3_utils.spec | 18 +++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 SOURCES/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch diff --git a/SOURCES/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch b/SOURCES/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch new file mode 100644 index 0000000..bd65db1 --- /dev/null +++ b/SOURCES/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch @@ -0,0 +1,29 @@ +From 4957a561867b4f363b0711bb5e0a3292f3067ce7 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Tue, 9 Jan 2024 22:10:09 +0100 +Subject: [PATCH] udev rules: avoid spurious warning for non-SCSI devices + +The udev rules spit out lots of warnings like this: + +55-scsi-sg3_id.rules[15445]: WARNING: SCSI device loop0 has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules + +Because the warning code had erroneously been inserted in the +"sg3_utils_id_end" clause. Fix it. + +Fixes: d7b8da0 ("udev rules: restrict use of ambiguous device IDs patchset") +--- + scripts/55-scsi-sg3_id.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules +index 5e9732d6..f3ddb065 100644 +--- a/scripts/55-scsi-sg3_id.rules ++++ b/scripts/55-scsi-sg3_id.rules +@@ -147,6 +147,6 @@ ENV{SCSI_IDENT_SERIAL}=="?*", ENV{.SCSI_ID_SERIAL_SRC}=="*S*", \ + ENV{ID_SERIAL}="S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}", \ + ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_SERIAL}" + +-LABEL="sg3_utils_id_end" + ENV{ID_SERIAL}!="?*", ENV{DEVTYPE}=="disk", \ + PROGRAM="/bin/logger -t 55-scsi-sg3_id.rules -p daemon.warning \"WARNING: SCSI device %k has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules\"" ++LABEL="sg3_utils_id_end" diff --git a/SPECS/sg3_utils.spec b/SPECS/sg3_utils.spec index 26618d8..3106d05 100644 --- a/SPECS/sg3_utils.spec +++ b/SPECS/sg3_utils.spec @@ -4,12 +4,15 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source1: scsi-rescan.8 +# https://github.com/doug-gilbert/sg3_utils/pull/47 +Patch0: udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch + Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make BuildRequires: gcc @@ -56,6 +59,12 @@ developing applications. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# Fix filename references to other udev rules +sed -i 's|55-scsi-sg3_id.rules|61-scsi-sg3_id.rules|' scripts/*.rules +sed -i 's|58-scsi-sg3_symlink.rules|63-scsi-sg3_symlink.rules|' scripts/*.rules +sed -i 's|59-scsi-cciss_id.rules|65-scsi-cciss_id.rules|' scripts/*.rules +sed -i 's|59-fc-wwpn-id.rules|63-fc-wwpn-id.rules|' scripts/*.rules + %make_build @@ -71,6 +80,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man8 # install all extra udev rules mkdir -p %{buildroot}%{_udevrulesdir} mkdir -p %{buildroot}%{_udevlibdir} +install -p -m 644 scripts/00-scsi-sg3_config.rules %{buildroot}%{_udevrulesdir} install -p -m 644 scripts/40-usb-blacklist.rules %{buildroot}%{_udevrulesdir} # need to run after 60-persistent-storage.rules install -p -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}%{_udevrulesdir}/61-scsi-sg3_id.rules @@ -100,6 +110,7 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %{_mandir}/man8/sgp_dd.8* %{_mandir}/man8/%{name}.8* %{_mandir}/man8/%{name}_json.8* +%{_udevrulesdir}/00-scsi-sg3_config.rules %{_udevrulesdir}/61-scsi-sg3_id.rules %{_udevrulesdir}/63-scsi-sg3_symlink.rules %{_udevrulesdir}/63-fc-wwpn-id.rules @@ -117,6 +128,11 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Mon Nov 04 2024 Tomas Bzatek - 1.48-7 +- udev rules: avoid spurious warning for non-SCSI devices (RHEL-40861,RHEL-54607) +- Install missing 00-scsi-sg3_config.rules +- Fix file references to other udev rules + * Tue Oct 29 2024 Troy Dawson - 1.48-6 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018