diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-10-21 01:12:57 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-10-21 01:12:57 +0000 |
commit | c1dd5fe542f8d03a048e478cf4c0f66fa0c0dd4a (patch) | |
tree | 8895a77a002302d733f12bc574689bc7057e989d /sys-fs | |
parent | Ok, according to Greg KH 003, 004, etc is going to be the new versioning (diff) | |
download | gentoo-2-c1dd5fe542f8d03a048e478cf4c0f66fa0c0dd4a.tar.gz gentoo-2-c1dd5fe542f8d03a048e478cf4c0f66fa0c0dd4a.tar.bz2 gentoo-2-c1dd5fe542f8d03a048e478cf4c0f66fa0c0dd4a.zip |
Ok, according to Greg KH 003, 004, etc is going to be the new versioning
scheme, so revert my version fix.
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 4 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-003 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-003-fix-partition-support.patch | 117 | ||||
-rw-r--r-- | sys-fs/udev/udev-003.ebuild | 58 |
5 files changed, 186 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 022aea606e97..a7bf861f3899 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.3 2003/10/21 01:02:58 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.4 2003/10/21 01:12:50 azarah Exp $ + +*udev-003 (21 Oct 2003) + + 21 Oct 2003; Martin Schlemmer <azarah@gentoo.org> udev-003.ebuild, + files/udev-003-fix-partition-support.patch: + Ok, according to Greg KH 003, 004, etc is going to be the new versioning + scheme, so revert my version fix. 21 Oct 2003; Martin Schlemmer <azarah@gentoo.org> udev-0.3.ebuild: Update DEPEND with hotplug, as we should be able to start using udev without diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 9c8ffc235f51..fd83c360ecc1 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,7 +1,7 @@ MD5 eed728de6213759fb6f411579482ffb4 udev-0.3.ebuild 1592 -MD5 6d4c3b6ce986bccdb91d89b4837db7d8 ChangeLog 758 +MD5 6d148a385adabe71d16e7136ab61a0a1 ChangeLog 1010 MD5 d399ff00f6745741dfa78cfb944fc5b2 udev-0.2.ebuild 1448 -MD5 94d665bcf8cd8bd59ae6df9b253f1815 udev-003.ebuild 1454 +MD5 7bcfbb3f4f8989b4124402541419d845 udev-003.ebuild 1454 MD5 ebe0e5db30b74307da3dcbe4fa5c6709 files/digest-udev-0.2 60 MD5 6a2ddd6bc79a92b74b4da57f442504d4 files/digest-udev-003 61 MD5 97e31caf42d33ffd640691e3aeed5a73 files/udev-0.2-major_minor-in-decimal.patch 1303 diff --git a/sys-fs/udev/files/digest-udev-003 b/sys-fs/udev/files/digest-udev-003 new file mode 100644 index 000000000000..0a0401b74c3a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-003 @@ -0,0 +1 @@ +MD5 80d228e6345cae18c34ee9182b823ee1 udev-003.tar.bz2 108593 diff --git a/sys-fs/udev/files/udev-003-fix-partition-support.patch b/sys-fs/udev/files/udev-003-fix-partition-support.patch new file mode 100644 index 000000000000..6b6092493b70 --- /dev/null +++ b/sys-fs/udev/files/udev-003-fix-partition-support.patch @@ -0,0 +1,117 @@ +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/udev-003.ebuild b/sys-fs/udev/udev-003.ebuild new file mode 100644 index 000000000000..6f8b30a48187 --- /dev/null +++ b/sys-fs/udev/udev-003.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-003.ebuild,v 1.1 2003/10/21 01:12:50 azarah Exp $ + +DESCRIPTION="udev - Linux dynamic device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +DEPEND="virtual/glibc + >=sys-apps/hotplug-20030805-r1 + sys-fs/sysfsutils" + +src_unpack() { + unpack ${A} + + cd ${S} + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + # Also use our own CFLAGS for libsysfs + sed -ie "/^CFLAGS/ c\CFLAGS = ${CFLAGS}" libsysfs/Makefile + + # Make sure we do not build libsysfs + # For now we use included libsysfs, as udev do not work with + # latest libsysfs from sysfsutils yet ... +# echo 'all:' > libsysfs/Makefile + + epatch ${FILESDIR}/${P}-fix-partition-support.patch +} + +src_compile() { + # Do not work with emake + make udevdir="/dev/" || die +} + +src_install() { + into / + dosbin udev + + insinto /etc/udev + doins namedev.config +# doins ${FILESDIR}/namedev.permissions + doins namedev.permissions + + dodir /etc/hotplug.d/default + dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug + + doman udev.8 + + dodoc COPYING ChangeLog FAQ README TODO + dodoc docs/overview +} + |