diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-12-17 19:47:26 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-12-17 19:47:26 +0000 |
commit | c2db62294039fa0a4e61b804d8a9a032123770d8 (patch) | |
tree | 4b6cf8b7354f76ebb9a29de53a6946e43ae54fd7 /sys-fs/udev/files | |
parent | New version. (diff) | |
download | gentoo-2-c2db62294039fa0a4e61b804d8a9a032123770d8.tar.gz gentoo-2-c2db62294039fa0a4e61b804d8a9a032123770d8.tar.bz2 gentoo-2-c2db62294039fa0a4e61b804d8a9a032123770d8.zip |
cleanup
Diffstat (limited to 'sys-fs/udev/files')
-rw-r--r-- | sys-fs/udev/files/digest-udev-003 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-004 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-005 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-005-r1 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-006 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-003-fix-partition-support.patch | 117 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-004-disk-loop-fix.patch | 29 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-004-label-fixes.patch | 53 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-004-manpage-update.patch | 190 |
9 files changed, 0 insertions, 394 deletions
diff --git a/sys-fs/udev/files/digest-udev-003 b/sys-fs/udev/files/digest-udev-003 deleted file mode 100644 index 0a0401b74c3a..000000000000 --- a/sys-fs/udev/files/digest-udev-003 +++ /dev/null @@ -1 +0,0 @@ -MD5 80d228e6345cae18c34ee9182b823ee1 udev-003.tar.bz2 108593 diff --git a/sys-fs/udev/files/digest-udev-004 b/sys-fs/udev/files/digest-udev-004 deleted file mode 100644 index adea615e4e21..000000000000 --- a/sys-fs/udev/files/digest-udev-004 +++ /dev/null @@ -1 +0,0 @@ -MD5 1f3cd6ba984ed947aa004be29ca362cf udev-004.tar.bz2 117693 diff --git a/sys-fs/udev/files/digest-udev-005 b/sys-fs/udev/files/digest-udev-005 deleted file mode 100644 index c9673a4e57d8..000000000000 --- a/sys-fs/udev/files/digest-udev-005 +++ /dev/null @@ -1 +0,0 @@ -MD5 66fabb537fc4c844b66eb0146cd8bf08 udev-005.tar.bz2 206007 diff --git a/sys-fs/udev/files/digest-udev-005-r1 b/sys-fs/udev/files/digest-udev-005-r1 deleted file mode 100644 index c9673a4e57d8..000000000000 --- a/sys-fs/udev/files/digest-udev-005-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 66fabb537fc4c844b66eb0146cd8bf08 udev-005.tar.bz2 206007 diff --git a/sys-fs/udev/files/digest-udev-006 b/sys-fs/udev/files/digest-udev-006 deleted file mode 100644 index cfba1cf307c6..000000000000 --- a/sys-fs/udev/files/digest-udev-006 +++ /dev/null @@ -1 +0,0 @@ -MD5 c8a74d7555c059231e2754db1593480e udev-006.tar.bz2 816636 diff --git a/sys-fs/udev/files/udev-003-fix-partition-support.patch b/sys-fs/udev/files/udev-003-fix-partition-support.patch deleted file mode 100644 index 6b6092493b70..000000000000 --- a/sys-fs/udev/files/udev-003-fix-partition-support.patch +++ /dev/null @@ -1,117 +0,0 @@ -From linux-kernel-owner@vger.kernel.org Mon Oct 20 16:01:15 2003 -Return-Path: <workshop@cpt.saharapc.co.za> -X-Original-To: azarah@tamperd.net -Delivered-To: azarah@tamperd.net -Received: from localhost (localhost [127.0.0.1]) by mail1.tamperd.net - (Postfix) with ESMTP id B3F3C26C0FA for <azarah@tamperd.net>; Mon, 20 Oct - 2003 16:01:15 +0200 (CEST) -Received: from emu.gentoo.org (emu.gentoo.oregonstate.edu [128.193.0.39]) - by mail1.tamperd.net (Postfix) with ESMTP id 9ED4726C0E6 for - <azarah@tamperd.net>; Mon, 20 Oct 2003 16:01:14 +0200 (CEST) -Received: from mail.gentoo.org ([204.126.2.42] helo=gentoo.org) by - emu.gentoo.org with esmtp (Exim 4.22) id 1ABaav-00048k-T9 for - azarah@dev.gentoo.org; Mon, 20 Oct 2003 14:01:14 +0000 -Received: (qmail 9395 invoked by alias); 20 Oct 2003 14:01:13 -0000 -Delivered-To: azarah@gentoo.org -Received: (qmail 2656 invoked from network); 20 Oct 2003 14:01:07 -0000 -Received: from unknown (HELO angel.sistech.co.za) (196.41.3.119) by - mail.gentoo.org with SMTP; 20 Oct 2003 14:01:07 -0000 -Received: from andromeda.cpt.sahara.co.za (mail.cpt.sahara.co.za - [196.41.29.142]) by angel.sistech.co.za (8.11.6/SVW2.4) with ESMTP id - h9KE0uv12906 for <azarah@gentoo.org>; Mon, 20 Oct 2003 16:00:57 +0200 -Received: from tom.saharacpt.lan ([10.0.4.50]) by - andromeda.cpt.sahara.co.za (8.11.6/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP - id h9KA91518467 for <azarah@gentoo.org>; Mon, 20 Oct 2003 12:09:07 +0200 -Resent-Date: Mon, 20 Oct 2003 12:09:07 +0200 -Resent-Message-Id: <200310201009.h9KA91518467@andromeda.cpt.sahara.co.za> -Received: from vger.kernel.org (vger.kernel.org [67.72.78.212]) by - andromeda.cpt.sahara.co.za (8.11.6/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP - id h9HIX5522452 for <workshop@cpt.saharapc.co.za>; Fri, 17 Oct 2003 - 20:33:06 +0200 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id - S263494AbTJQScQ (ORCPT <rfc822;workshop@cpt.saharapc.co.za>); Fri, 17 Oct - 2003 14:32:16 -0400 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263583AbTJQScQ - (ORCPT <rfc822;linux-kernel-outgoing>); Fri, 17 Oct 2003 14:32:16 -0400 -Received: from mail.kroah.org ([65.200.24.183]:27032 "EHLO - perch.kroah.org") by vger.kernel.org with ESMTP id S263494AbTJQScO (ORCPT - <rfc822;linux-kernel@vger.kernel.org>); Fri, 17 Oct 2003 14:32:14 -0400 -Received: from DYN318258BLD.beaverton.ibm.com (bi01p1.co.us.ibm.com - [32.97.110.142]) (authenticated) by perch.kroah.org (8.11.6/8.11.6) with - ESMTP id h9HIQUh14125; Fri, 17 Oct 2003 11:26:30 -0700 -Received: from greg by echidna.kroah.org with local (masqmail 0.2.19) id - 1AAZKM-2nK-00; Fri, 17 Oct 2003 11:27:54 -0700 -From: Greg KH <greg@kroah.com> -To: clemens@dwf.com -Cc: linux-hotplug-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, reg@orion.dwf.com -Message-ID: <20031017182754.GA10714@kroah.com> -References: <20031017055652.GA7712@kroah.com> - <200310171757.h9HHvGiY006997@orion.dwf.com> - <20031017181923.GA10649@kroah.com> -Mime-Version: 1.0 -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline -In-Reply-To: <20031017181923.GA10649@kroah.com> -User-Agent: Mutt/1.4.1i -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -X-Mailing-List: linux-kernel@vger.kernel.org -X-SAHARACPT-MailScanner: Found to be clean, Found to be clean -X-UIDL: kRp"!<XG!!T5$"!~DB!! -Subject: Re: [ANNOUNCE] udev 003 release -Resent-From: Sahara Workshop <workshop@cpt.saharapc.co.za> -Resent-To: Martin Schlemmer <azarah@gentoo.org> -X-Mailer: Ximian Evolution 1.4.4 -Date: Mon, 20 Oct 2003 12:07:06 +0200 -X-SAHARACPT-MailScanner-Information: Please contact the ISP for more - information -X-ANGEL-MailScanner-Information: Please contact the ISP for more information -X-ANGEL-MailScanner: Found to be clean -Resent-Date: Mon, 20 Oct 2003 14:01:14 +0000 -X-Virus-Scanned: by AMaViS 0.3.12 -X-Evolution-Source: pop://azarah%40tamperd.net@lajka.tamperd.net -Content-Transfer-Encoding: 8bit - -On Fri, Oct 17, 2003 at 11:19:23AM -0700, Greg KH wrote: -> -> Ah, yeah, udev seg faults right now for partitions. Let me try to track -> down the bug, give me a bit of time... - -Here's a patch that fixes the partition logic for me. Sorry about this, I -need to make sure to test partitions more next time. - -thanks again for testing this. - -greg k-h - -# fix segfaults when dealing with partitions. - -diff -Nru a/udev-add.c b/udev-add.c ---- a/udev-add.c Fri Oct 17 11:26:37 2003 -+++ b/udev-add.c Fri Oct 17 11:26:37 2003 -@@ -169,13 +169,13 @@ - } - memset(&dbdev, 0, sizeof(dbdev)); - strncpy(dbdev.name, attr.name, NAME_SIZE); -- strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path, -- PATH_SIZE); -+ if (class_dev->sysdevice) { -+ strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path, PATH_SIZE); -+ strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE); -+ } - strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE); -- if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) -- != 0) -+ if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) != 0) - strcpy(dbdev.class_name, "unkown"); -- strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE); - strcpy(dbdev.bus_name, "unknown"); - if (class_dev->driver != NULL) - strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE); -- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ - - diff --git a/sys-fs/udev/files/udev-004-disk-loop-fix.patch b/sys-fs/udev/files/udev-004-disk-loop-fix.patch deleted file mode 100644 index ef179e85bbe0..000000000000 --- a/sys-fs/udev/files/udev-004-disk-loop-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Thanks for the new release, Greg. I just tried it out on a system with -some disks, but a bunch of udev processes ended up hanging. Is there -something I'm missing or do you need a patch like this? - -Thanks, -Jesse - ---- udev-004/udev-add.c Mon Oct 20 14:39:08 2003 -+++ udev-004-working/udev-add.c Tue Oct 21 14:42:27 2003 -@@ -141,7 +141,7 @@ - strcat(filename, path); - strcat(filename, "/dev"); - -- while (loop < SECONDS_TO_WAIT_FOR_DEV) { -+ while (loop++ < SECONDS_TO_WAIT_FOR_DEV) { - dbg("looking for %s", filename); - retval = stat(filename, &buf); - if (retval == 0) { - - -------------------------------------------------------- -This SF.net email is sponsored by OSDN developer relations -Here's your chance to show off your extensive product knowledge -We want to know what you know. Tell us and you have a chance to win $100 -http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 -_______________________________________________ -Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net -Linux-hotplug-devel@lists.sourceforge.net -https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
\ No newline at end of file diff --git a/sys-fs/udev/files/udev-004-label-fixes.patch b/sys-fs/udev/files/udev-004-label-fixes.patch deleted file mode 100644 index 793052cc7d9d..000000000000 --- a/sys-fs/udev/files/udev-004-label-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -On Tue, Oct 21, 2003 at 03:13:38PM -0700, Greg KH wrote: -> On Tue, Oct 21, 2003 at 02:45:55PM -0700, Jesse Barnes wrote: -> > Thanks for the new release, Greg. I just tried it out on a system with -> > some disks, but a bunch of udev processes ended up hanging. Is there -> > something I'm missing or do you need a patch like this? -> -> Yeah, sorry, this kind of fix is required :( -> -> It's fixed in my bk tree now. -> -> Oh, and it looks like the LABEL rule is also broken due to the libsysfs -> changes... I'm working on adding regression tests right now to prevent -> things like this from slipping through. - -Here's a patch for this. It fixes the problem of LABEL rules on the -device, not the class device. LABEL rules on the class device seem to -work just fine. - -Thanks to Dan Stekloff for help in finding this bug. - -thanks, - -greg k-h - - -# fix LABEL bug for device files (not class files.) - -diff -Nru a/namedev.c b/namedev.c ---- a/namedev.c Tue Oct 21 18:44:59 2003 -+++ b/namedev.c Tue Oct 21 18:44:59 2003 -@@ -566,7 +566,7 @@ - - /* look in the class device directory if present */ - if (class_dev->sysdevice) { -- tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file); -+ tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file); - if (tmpattr) - goto label_found; - } -@@ -599,7 +599,7 @@ - - /* look in the class device directory if present */ - if (class_dev_parent->sysdevice) { -- tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file); -+ tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file); - if (tmpattr) - goto label_found; - } -- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/
\ No newline at end of file diff --git a/sys-fs/udev/files/udev-004-manpage-update.patch b/sys-fs/udev/files/udev-004-manpage-update.patch deleted file mode 100644 index 2bfdeb621ca5..000000000000 --- a/sys-fs/udev/files/udev-004-manpage-update.patch +++ /dev/null @@ -1,190 +0,0 @@ - ---EeQfGwPcQSOJBaQU -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -On Tue, Oct 21, 2003 at 09:28:56AM -0700, Greg KH wrote: -> Hi, -> -> I've released the 004 version of udev. It can be found at: -> kernel.org/pub/linux/utils/kernel/hotplug/udev-004.tar.gz - -Hi Greg, - -here a new patch for the man page: -o namdev.permissions added -o corrected a few typos -o corrected text for config line format. - owner, group mode are only in namedev.permissions - (don't know what i was dreaming, while i wrote this :)) - - -and a patch for namdev.c comments + debug -o correct 'device device' -o correct permission file to config file - - -I was looking how to set permissions on the created node. -What is the future of struct device_attr? -Same values are in struct udevice now? - - -thanks, -Kay - - ---EeQfGwPcQSOJBaQU -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline; filename="udev.8.diff" - ---- /usr/src/udev/udev.8 2003-10-21 15:27:00.000000000 +0200 -+++ udev.8 2003-10-21 22:07:25.000000000 +0200 -@@ -2,28 +2,30 @@ - .SH NAME - udev \- Linux configurable dynamic device naming support - .SH SYNOPSIS --.B udev -+.BI udev " hotplug-subsystem" - .SH "DESCRIPTION" - .B udev - creates or removes device node files usually located in the /dev directory. -+Its goal is to provide a dynamic device directory that contains only the files -+for devices that are actually present. -+.P - As part of the - .B hotplug - subsystem, - .B udev --is exectuted if a kernel device is added or removed from the system. --.P -+is executed if a kernel device is added or removed from the system. - On device creation, - .B udev --reads the sysfs directory of the given device, to collect device attributes -+reads the sysfs directory of the given device to collect device attributes - like label, serial number or bus device number. - These attributes are passed as a key to the namedev subsystem - to receive a unique name for device file creation. - namedev maintains a database for devices present on the system. --.P -+.br - On device removal, - .B udev --queries the namedev database for the name of the device file to delete. --.P -+queries the namedev database for the name of the device file to be deleted. -+.SH "CONFIGURATION" - namedev expects its configuration at - .I /etc/udev/namedev.config. - The file consists of a set of lines. All empty lines and -@@ -31,11 +33,16 @@ - .br - Every line defines the mapping between device attributes and the device file - name. It starts with a keyword defining the method used to match, followed by --one ore more keys to compare, optional ownwership and permission settings and --the filename for the device. If no matching configuration is found, --the default kernel device name is used. -+one ore more keys to compare and the filename for the device. If no matching -+configuration is found, the default kernel device name is used. - .P --.I method, key,[key,...] [owner,] [group,] [mode,] name -+The line format is: -+.RS -+.sp -+.I method, key,[key,...] name -+.sp -+.RE -+where valid methods with corresponding keys are: - .TP - .B LABEL - device label or serial number, like USB serial number, SCSI UUID or -@@ -62,7 +69,9 @@ - calling external program, that returns a string to match - .br - keys: \fBBUS\fP, \fBPROGRAM\fP, \fBID\fP --.SH "EXAMPLE" -+.P -+A sample \fInamedev.conf\fP might look like this: -+.sp - .nf - # USB printer to be called lp_color - LABEL, BUS="usb", serial="W09090207101241330", NAME="lp_color" -@@ -79,6 +88,22 @@ - # if /sbin/dev_id returns "V0815" device will be called dev0815 - CALLOUT, PROGRAM="/sbin/dev_id", BUS="pci", ID="V0815", NAME="dev0815" - .fi -+.P -+Permissions and ownership for the created device files may specified at -+.I /etc/udev/namedev.permissions. -+The file consists of a set of lines. All empty lines and -+lines beginning with a '#' will be ignored. -+.br -+Every line lists a device name followed by owner, group and permission mode. All values are separated by colons. -+.sp -+A sample \fInamedev.permissions\fP might look like this: -+.sp -+.nf -+#name:user:group:mode -+ttyUSB1:root:uucp:0666 -+dsp1:::0666 -+.fi -+ - .SH "FILES" - .nf - .ft B -@@ -89,7 +114,7 @@ - .fi - .LP - .SH "SEE ALSO" --.B hotplug (8) -+.BR hotplug (8) - .PP - The - .I http://linux-hotplug.sourceforge.net/ - ---EeQfGwPcQSOJBaQU -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline; filename="namedev-comments.diff" - ---- namedev.c 2003-10-21 15:27:53.000000000 +0200 -+++ namedev.c.1 2003-10-21 21:55:43.000000000 +0200 -@@ -207,7 +207,7 @@ - struct config_device dev; - - strcpy(filename, UDEV_CONFIG_DIR NAMEDEV_CONFIG_FILE); -- dbg("opening %s to read as permissions config", filename); -+ dbg("opening %s to read as config", filename); - fd = fopen(filename, "r"); - if (fd == NULL) { - dbg("Can't open %s", filename); -@@ -568,7 +568,7 @@ - if (tmpattr) - goto label_found; - -- /* look in the class device device directory if present */ -+ /* look in the class device directory if present */ - if (class_dev->sysdevice) { - tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file); - if (tmpattr) -@@ -601,7 +601,7 @@ - if (tmpattr) - goto label_found; - -- /* look in the class device device directory if present */ -+ /* look in the class device directory if present */ - if (class_dev_parent->sysdevice) { - tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file); - if (tmpattr) - ---EeQfGwPcQSOJBaQU-- - - -------------------------------------------------------- -This SF.net email is sponsored by OSDN developer relations -Here's your chance to show off your extensive product knowledge -We want to know what you know. Tell us and you have a chance to win $100 -http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 -_______________________________________________ -Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net -Linux-hotplug-devel@lists.sourceforge.net -https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
\ No newline at end of file |