From 3d94fb8742847afe8396f6dd38b16ff4e836611d Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 28 Jan 2006 16:42:49 +0100 Subject: [PATCH] scsi_id: remove dead files Signed-off-by: Kay Sievers --- extras/scsi_id/ChangeLog | 208 ----------------------------------- extras/scsi_id/README | 14 +-- extras/scsi_id/TODO | 8 -- extras/scsi_id/release-notes | 23 ---- extras/scsi_id/scsi.h | 17 +-- extras/scsi_id/scsi_id.c | 19 +--- extras/scsi_id/scsi_id.h | 17 +-- extras/scsi_id/scsi_serial.c | 18 +-- 8 files changed, 19 insertions(+), 305 deletions(-) delete mode 100644 extras/scsi_id/ChangeLog delete mode 100644 extras/scsi_id/TODO delete mode 100644 extras/scsi_id/release-notes diff --git a/extras/scsi_id/ChangeLog b/extras/scsi_id/ChangeLog deleted file mode 100644 index d2a8be5b1..000000000 --- a/extras/scsi_id/ChangeLog +++ /dev/null @@ -1,208 +0,0 @@ -2004-oct-15: - * Makefile: Add $(QUIET) to sync with the udev version. - -2004-oct-06: - * scsi_id.c: fix alignment for use with 64 bit pointers - -2004-jul-30: - * scsi_id.c, scsi_serial.c: Align the buffer passed to scsi_serial, - don't bother aligning and memcpy-ing the result in scsi_inquiry. - Aligning to 512 probably does not help, since the IO length of - 254 is not a multiple of 512. - -2004-jul-30: - * scsi.h, scsi_serial.c: Use a define for the SCSI INQUIRY buffer - length. - -2004-jul-30: - * scsi_id.c: Patch from add a -u flag - to substitute white space with underscores so it is easier to use - the output as a device name. - -2004-jul-30: - * scsi_serial.c: Patch from Hannes Reinecke use 254 - bytes for SCSI INQUIRY commands. - -2004-jul-28: - * scsi_id.h, scsi_serial.c: get rid of dumb/dead code, and use a - 512 byte aligned buffer. - -2004-jun-23: - * scsi_id.h: increase MAX_SERIAL_LEN from 128 to 256, as some - devices (maybe broken ones) are giving really long id's. - -2004-jun-17: - * Makefile: Olaf Hering add spotless target (already in udev). - -2004-jun-17: - * scsi_serial.c: Include linux/compiler.h so we can build with - klibc using kernel headers. - -2004-may-24: - * scsi_id.c: Rename major and minor to maj min to avoid compiler - warnings when compiled with -D_GNU_SOURCE. - -2004-mar-30: - * scsi_id.config: Minor wording changes - -2004-mar-30: - * scsi_id.h: Don't supply a makedev() when built under klibc. - -2004-mar-30: - * scsi_id.c: Ken Brush Have the command line - options override generic options. - -2004-mar-05: - * scsi_serial.c: Log INQUIRY failure, including the - failing page code and vpd values. And add a dprintf() to - the scsi_inquiry function. - -2004-mar-02: - * gen_scsi_id_udev_rules.sh: Per bug report from Atul Sabharwal - change to not require that sysfs be - in the mount tab (and default to "/sys"), and fix so scsi_id - results containing spaces work correctly. - -2004-mar-02: - * scsi_id.8: Escape '-' with '\-'. - -2004-feb-25: - * scsi_id.8: Add verbage about usage with udev, and running via - hotplug. - -2004-feb-25: - * scsi_id.c, scsi_id.8: Disable support for -e (all output to - stderr) as it cannot be used in any useful way, and the -c - (device specific callout) as the code is incomplete and has no - users. - -2004-feb-25: - * scsi_id.c: Don't print errno for NULL return from - sysfs_get_classdev_device. - -2004-feb-23: - * scsi_id.c: Get rid of dead/leftover code that checked - if we are on a scsi bus. - -2004-feb-23: - * scsi_serial.c, scsi_id.c: Use ":" consistently in output messages. - -2004-feb-23: - * scsi_serial.c: Add missing new lines for some error messages. - -2004-feb-23: - * scsi_serial.c: open O_NONBLOCK so we handle tape drives without - tapes loaded. - -2004-feb-20: - * scsi_id.h, scsi_id.c: Remove hacks based on KLIBC define to get - around problems when building with udev (udev libsysfs files - were rearranged). - -2004-feb-19: - * scsi_id.h, scsi_id.c, scsi_serial.c: As done in udev code, support - partitions via looking for a parent of the target path. Uses - libsysfs functions to do most of the work, and includes changing - a lot of variables to be struct sysfs_device instead of - sysfs_class_device. - -2004-feb-19: - * Makefile: Version 0.4 - -2004-jan-15: - * Makefile: Version 0.3 - -2004-jan-13: - * scsi_id.c, Makefile: Fix prefix usage with scsi_id.config. - -2004-jan-13: - * scsi_id.config: Clean up some comment entries. - -2004-jan-13: - * Makefile: Install the sample scsi_id.config file. - -2004-jan-13: - * Makefile: Use DESTDIR in all install/uninstall rules, per - problem reported by Svetoslav Slavtchev. - -2004-jan-12: - * scsi_id.h, scsi_id.c, scsi_serial.c: Fix to work with current - sysfs 0.4, based on patch from Dan Stekloff, but uses - sysfs_read_attribute_value instead of - sysfs_get_value_from_attributes. - -2004-jan-08: - * scsi_id.c: SYSFS_BUS_DIR was replaced with SYSFS_BUS_NAME. - -2004-jan-08: - * scsi_id.c: Must now use sysfs_open_class_device_path instead of the - previous sysfs_open_class_device. - -2003-dec-07: - * Makefile: patch from Olaf Hering remove DEBUG and - add --fno-builtin - -2003-dec-05: - * Makefile, scsi_id.8: Add a man page. - -2003-dec-04: - * Makefile: Set and use variables that might be passed down when - built under udev (with or without klibc), don't set LDFLAGS or - STRIP. - -2003-dec-04: - * scsi_id.c, scsi_id.h: Fix a bad bug - when parsing file options, - no space was allocated for the creation of the new argv[] - strings. - -2003-dec-04: - * scsi_id.c: Catch too long a line in the config file. - -2003-dec-02: - * scsi_id.h: Add u8 typedef to avoid ummm scsi.h kernel header - problem when built with klibc. - -2003-dec-02: - * scsi_id.h: Add define of makedev() if built with klibc. - -2003-dec-02: - * scsi_id.c: reset optind to 1 since klibc does not work if it is - reset to zero. - -2003-dec-02: - * scsi_id.c: remove fflush() as it is not needed, and is not - supported by klibc. - -2003-dec-02: - * scsi_serial.c: Make the functions do_scsi_page0_inquiry and - do_scsi_page80_inquiry static. - -2003-dec-01: - * scsi_id.c: Don't use syslog LOG_PID, as it is not supported by - klibc. - -2003-dec-01: - * scsi_id.c, scsi_serial.c: Hack - change include path to libsysfs - if built under klibc. - -2003-dec-01: - * Makefile: Use "override" for CFLAGS so we can pass CFLAGS values - down when built with udev - -2003-dec-01: - * scsi_id.c, Makefile: Use SCSI_ID_VERSION instead of VERSION. - -2003-nov-25: - * scsi_id.c: Remove getopt_long (long option names), as there - is no support for that in klibc. - -2003-nov-17: - * scsi_id.c: Patch from Brian King : check - result of setting model, not vendor in per_dev_options. - -2003-nov-03: - * scsi_id.c, scsi_serial.c: Use new and correct path to libsysfs.h. - -2003-nov-03: - * scsi_id.h: Fix scsi_id.h so var args in macros works ok with - older gcc. diff --git a/extras/scsi_id/README b/extras/scsi_id/README index 97af51730..9cfe73991 100644 --- a/extras/scsi_id/README +++ b/extras/scsi_id/README @@ -1,14 +1,4 @@ scsi_id - generate a SCSI unique identifier for a given SCSI device -Primarily for use with udev callout config entries. This could also be -used by a multi-path configuration tool that requires SCSI id's. - -Requires: - - - Linux kernel 2.6 - - - sysfsutils 0.4 - -Build via make and make install. - -Please send questions, comments or patches to patmans@us.ibm.com. +Please send questions, comments or patches to or +. diff --git a/extras/scsi_id/TODO b/extras/scsi_id/TODO deleted file mode 100644 index 857c22b87..000000000 --- a/extras/scsi_id/TODO +++ /dev/null @@ -1,8 +0,0 @@ -- Add a bus white/black list option. So for example, all scsi devices - under USB could easily be blacklisted. This should allow multiple busses - to be listed. - -- Add code to check that SCSI commands get back enough data for their - intended usage, mainly callers of scsi_inquiry(). - -- Document the config file in the man page diff --git a/extras/scsi_id/release-notes b/extras/scsi_id/release-notes deleted file mode 100644 index c7ea51679..000000000 --- a/extras/scsi_id/release-notes +++ /dev/null @@ -1,23 +0,0 @@ -Version 0.7 of scsi_id is available at: - -http://www-124.ibm.com/storageio/scsi_id/scsi_id-0.7.tar.gz - -scsi_id is a program to generate a unique identifier for a given SCSI -device. - -It is primarily for use with the udev program key, or hotplug scripts that -want persistent naming of scsi devices. It could also be used for -automatic multi-path configuration or device mapper configuration. - -Requires: - -- Linux kernel 2.6 -- libsysfs 0.4.0 - -Changes since the last release: - - - Fix a bug introduced in version 0.6 so that buffer alignement - works on 64 bit systems. Without this fix, it crashes on 64 bit - systems. - - - Add $(QUIET) to sync up with the udev Makefile diff --git a/extras/scsi_id/scsi.h b/extras/scsi_id/scsi.h index 212765a17..f5aa686f7 100644 --- a/extras/scsi_id/scsi.h +++ b/extras/scsi_id/scsi.h @@ -5,20 +5,9 @@ * * Copyright (C) IBM Corp. 2003 * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. */ #include diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index 6458f2b7a..2ffc95fbf 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -4,21 +4,14 @@ * Main section of the scsi_id program * * Copyright (C) IBM Corp. 2003 + * Copyright (C) SUSE Linux Products GmbH, 2006 * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of the - * License, or (at your option) any later version. + * Author: + * Patrick Mansfield * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. */ #include diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h index 758706ba2..64ea34906 100644 --- a/extras/scsi_id/scsi_id.h +++ b/extras/scsi_id/scsi_id.h @@ -5,20 +5,9 @@ * * Copyright (C) IBM Corp. 2003 * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. */ #define MAX_PATH_LEN 512 diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c index bdebe94eb..0ecfebe1b 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/extras/scsi_id/scsi_serial.c @@ -5,20 +5,12 @@ * * Copyright (C) IBM Corp. 2003 * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of the - * License, or (at your option) any later version. + * Author: + * Patrick Mansfield * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. */ #include -- 2.30.2