diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2021-11-05 23:31:50 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2021-11-05 23:31:50 +0000 |
| commit | 02beb6330465dfd55ce605206c35780f3c390d6b (patch) | |
| tree | 74e0ba4e59cf863711fdc63fe839684b6c979040 /scripts | |
| parent | 901931cfdad6f06e22c24beba339bb08d2265498 (diff) | |
| download | sg3_utils-02beb6330465dfd55ce605206c35780f3c390d6b.tar.gz | |
sgp_dd: add check for stdatomic.h presence in configure.ac; scripts: 55-scsi-sg3_id.rules remove outdated rule
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@918 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/55-scsi-sg3_id.rules | 6 | ||||
| -rw-r--r-- | scripts/Makefile.in | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules index 59c5e284..453210bd 100644 --- a/scripts/55-scsi-sg3_id.rules +++ b/scripts/55-scsi-sg3_id.rules @@ -42,12 +42,6 @@ KERNEL!="sd*[!0-9]|sr*", GOTO="sg3_utils_id_end" LABEL="scsi_inquiry" ENV{ID_SCSI_INQUIRY}=="0", GOTO="sg_inquiry" -# As of 2018/4.15, the kernel doesn't provide VPD pages for "SPC" devices -# (SCSI version 0x03, ANSI INCITS 301-1997) in sysfs. -# It's usually safe to try though (no counter-example is known), -# and for scsi_id compatibility, we have to try. -SUBSYSTEMS=="scsi", ATTRS{scsi_level}=="4", GOTO="sg_inquiry" - # "inquiry" is an attribute of the scsi_device in sysfs, # we obtain it by using $id after an ATTRS match. SUBSYSTEMS=="scsi", ATTRS{inquiry}=="*", KERNELS=="[0-9]*:*[0-9]", \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index bf2c5ad0..67388b4d 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,6 +162,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -172,6 +174,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_O_FILES = @GETOPT_O_FILES@ @@ -354,7 +357,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am |