diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2004-01-16 16:33:10 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2004-01-16 16:33:10 +0000 |
commit | 3a1dfbcfd23b67dea5670442190b31d448bac4db (patch) | |
tree | 9a02eae1cca1a4dd6d09444589c7905759480366 /sys-fs | |
parent | Update version. Update config files to suite new rules syntax. (diff) | |
download | historical-3a1dfbcfd23b67dea5670442190b31d448bac4db.tar.gz historical-3a1dfbcfd23b67dea5670442190b31d448bac4db.tar.bz2 historical-3a1dfbcfd23b67dea5670442190b31d448bac4db.zip |
Cleanup.
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/Manifest | 14 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-007 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-008 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-009 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-011 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-007-check-valid-mode.patch | 13 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-009-scsi_id-new-sysfs.patch | 108 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-011-ide-devfs-form-fixes.patch | 62 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-011-ide-devfs.patch | 86 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-011-namedev_c-gcc295-compat.patch | 13 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-011-unlink-before-symlink.patch | 27 | ||||
-rw-r--r-- | sys-fs/udev/udev-007.ebuild | 86 | ||||
-rw-r--r-- | sys-fs/udev/udev-008.ebuild | 92 | ||||
-rw-r--r-- | sys-fs/udev/udev-009.ebuild | 103 | ||||
-rw-r--r-- | sys-fs/udev/udev-011.ebuild | 132 |
15 files changed, 0 insertions, 740 deletions
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 3da9d7f72088..f76e19718df0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,26 +1,12 @@ MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343 -MD5 45b0f8041be46a9e278397cd99ad9076 udev-009.ebuild 2411 MD5 a25678475ae80afbb34ea2c94757348b ChangeLog 4619 -MD5 bb2f3caf9ec4cb1394ae3c94f2ee7a8c udev-008.ebuild 2063 MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400 -MD5 1db16c64ca71efbb0b4b02ae14c95abd udev-011.ebuild 3349 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 83a432ae3bb1162fe07c5dd0fa3d4fbe udev-007.ebuild 1976 MD5 dbe7dc643caeafddc845fe9269430123 files/udev-011-no-wait-for-sleep.patch 1053 MD5 b87af7c246fa800c37ddc9bd3497ca54 files/udev.conf 1123 MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277 -MD5 3c46e9235b0d541b3e286c9360e7ec09 files/udev-011-ide-devfs-form-fixes.patch 1920 -MD5 ad8f3d1f8a8ca711cb8c064a260b4541 files/digest-udev-008 61 -MD5 601051b266adc7ea02e420c337f985fd files/digest-udev-011 61 MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62 -MD5 336d350d91bd382e036d6178cfddf53d files/digest-udev-009 61 -MD5 fcb45730f317fcad0c3c577fd16243b2 files/udev-007-check-valid-mode.patch 372 -MD5 478505fe4446f893adbfc4d8db0b2038 files/udev-011-namedev_c-gcc295-compat.patch 529 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62 -MD5 915a7c2bcdf0cf3e3526ba49753936ec files/digest-udev-007 61 MD5 a2bd1197ad71d716a020735b5f0f1a38 files/udev.rules.post_012 3854 -MD5 a4c9abce9b6a2c2beeeacff0a604e2e1 files/udev-009-scsi_id-new-sysfs.patch 4357 MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550 -MD5 2e5ce093bf8390e3f212149706ed97eb files/udev-011-unlink-before-symlink.patch 772 -MD5 7bbe5e5911d5c569e85a389f4c489e01 files/udev-011-ide-devfs.patch 2565 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554 diff --git a/sys-fs/udev/files/digest-udev-007 b/sys-fs/udev/files/digest-udev-007 deleted file mode 100644 index 3c44e062aa9f..000000000000 --- a/sys-fs/udev/files/digest-udev-007 +++ /dev/null @@ -1 +0,0 @@ -MD5 b9fa9f8e163cc4b076c29b9a69e60dcd udev-007.tar.bz2 839202 diff --git a/sys-fs/udev/files/digest-udev-008 b/sys-fs/udev/files/digest-udev-008 deleted file mode 100644 index ef63d7bf3854..000000000000 --- a/sys-fs/udev/files/digest-udev-008 +++ /dev/null @@ -1 +0,0 @@ -MD5 3d5662c7e2f2ad4277e18e3551b85166 udev-008.tar.bz2 894999 diff --git a/sys-fs/udev/files/digest-udev-009 b/sys-fs/udev/files/digest-udev-009 deleted file mode 100644 index e478f3698cba..000000000000 --- a/sys-fs/udev/files/digest-udev-009 +++ /dev/null @@ -1 +0,0 @@ -MD5 efd82535fb3f66ecad89386b8518b60d udev-009.tar.bz2 954569 diff --git a/sys-fs/udev/files/digest-udev-011 b/sys-fs/udev/files/digest-udev-011 deleted file mode 100644 index 60d60733941d..000000000000 --- a/sys-fs/udev/files/digest-udev-011 +++ /dev/null @@ -1 +0,0 @@ -MD5 fb230e5fb5ae74e30b8671e40cbf002b udev-011.tar.bz2 961188 diff --git a/sys-fs/udev/files/udev-007-check-valid-mode.patch b/sys-fs/udev/files/udev-007-check-valid-mode.patch deleted file mode 100644 index 96038542ff76..000000000000 --- a/sys-fs/udev/files/udev-007-check-valid-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- udev-007/namedev.c.az 2003-11-24 19:55:17.524041640 +0200 -+++ udev-007/namedev.c 2003-11-24 19:55:21.163488360 +0200 -@@ -464,6 +464,10 @@ - } - strncpy(dev.group, temp2, sizeof(dev.owner)); - -+ if (!temp) { -+ dbg("cannot parse line: %s", line); -+ continue; -+ } - dev.mode = strtol(temp, NULL, 8); - - dbg_parse("name='%s', owner='%s', group='%s', mode=%#o", diff --git a/sys-fs/udev/files/udev-009-scsi_id-new-sysfs.patch b/sys-fs/udev/files/udev-009-scsi_id-new-sysfs.patch deleted file mode 100644 index 2cfc6e4af4e8..000000000000 --- a/sys-fs/udev/files/udev-009-scsi_id-new-sysfs.patch +++ /dev/null @@ -1,108 +0,0 @@ -From linux-kernel-owner@vger.kernel.org Wed Dec 17 20:39:13 2003 -Return-Path: <linux-kernel-owner+azarah=40nosferatu.za.org@vger.kernel.org> -X-Original-To: azarah@nosferatu.za.org -Delivered-To: azarah@nosferatu.za.org -Received: by gateway.lan (Postfix, from userid 290) id 1028C32415; Wed, 17 - Dec 2003 20:39:13 +0200 (SAST) -Received: from vger.kernel.org (vger.kernel.org [67.72.78.212]) by - gateway.lan (Postfix) with ESMTP id A53F432414 for - <azarah@nosferatu.za.org>; Wed, 17 Dec 2003 20:38:59 +0200 (SAST) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id - S264496AbTLQSSE (ORCPT <rfc822;azarah@nosferatu.za.org>); Wed, 17 Dec 2003 - 13:18:04 -0500 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264501AbTLQSSD - (ORCPT <rfc822;linux-kernel-outgoing>); Wed, 17 Dec 2003 13:18:03 -0500 -Received: from e35.co.us.ibm.com ([32.97.110.133]:44511 "EHLO - e35.co.us.ibm.com") by vger.kernel.org with ESMTP id S264496AbTLQSRn - convert rfc822-to-8bit (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, - 17 Dec 2003 13:17:43 -0500 -Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com - [9.17.195.11]) by e35.co.us.ibm.com (8.12.10/8.12.2) with ESMTP id - hBHIHfcp501168; Wed, 17 Dec 2003 13:17:41 -0500 -Received: from DYN319713.beaverton.ibm.com (d03av02.boulder.ibm.com - [9.17.193.82]) by westrelay02.boulder.ibm.com (8.12.10/NCO/VER6.6) with - ESMTP id hBHIHcbA057482; Wed, 17 Dec 2003 11:17:39 -0700 -From: Daniel Stekloff <dsteklof@us.ibm.com> -To: azarah@gentoo.org, Linux Kernel Mailing Lists <linux-kernel@vger.kernel.org> -Subject: Re: scsi_id segfault with udev-009 -Date: Wed, 17 Dec 2003 10:17:28 -0800 -User-Agent: KMail/1.4.1 -Cc: Greg KH <greg@kroah.com> -References: <1071682198.5067.17.camel@nosferatu.lan> -In-Reply-To: <1071682198.5067.17.camel@nosferatu.lan> -Message-Id: <200312171017.28358.dsteklof@us.ibm.com> -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -X-Mailing-List: linux-kernel@vger.kernel.org -X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on - gateway.lan -X-Spam-Level: -X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no - version=2.60 -X-Sanitizer: Advosys mail filter -MIME-Version: 1.0 -Content-Type: text/plain; charset="US-ASCII" -X-Evolution-Source: pop://azarah@gateway.lan -Content-Transfer-Encoding: 8bit - -On Wednesday 17 December 2003 09:29 am, Martin Schlemmer wrote: -> Hi -> -> Getting this with scsi_id and udev-009: - - -Hi, - -Scsi_id hasn't been changed to use the latest libsysfs changes. The -"directory" in the sysfs_class_device is now considered "private" and only -should be accessed using functions. Treating the structures as handles lets -us only load information when it's needed, reducing caching or stale -information and also helping performance. - -Here's the problem. - -static inline char *sysfs_get_attr(struct sysfs_class_device *dev, - const char *attr) -{ - return sysfs_get_value_from_attributes(dev->directory->attributes, - attr); -} - -Please try this quick fix: - ---- udev/extras/scsi_id/scsi_id.h 2003-12-08 01:42:46.000000000 -0800 -+++ udev-fix/extras/scsi_id/scsi_id.h 2003-12-17 09:52:31.032184768 -0800 -@@ -42,8 +42,14 @@ - static inline char *sysfs_get_attr(struct sysfs_class_device *dev, - const char *attr) - { -- return sysfs_get_value_from_attributes(dev->directory->attributes, -- attr); -+ struct dlist *attributes = NULL; -+ -+ attributes = sysfs_get_classdev_attributes(dev); -+ -+ if (attributes == NULL) -+ return NULL; -+ -+ return sysfs_get_value_from_attributes(attributes, attr); - } - - extern int scsi_get_serial (struct sysfs_class_device *scsi_dev, ---- udev/extras/scsi_id/scsi_id.c 2003-12-08 01:42:46.000000000 -0800 -+++ udev-fix/extras/scsi_id/scsi_id.c 2003-12-17 09:55:54.113311744 -0800 -@@ -133,7 +133,7 @@ - return -1; - - snprintf(bus_dev_name, MAX_NAME_LEN, "%s/%s/%s/%s/%s", sysfs_mnt_path, -- SYSFS_BUS_DIR, bus, SYSFS_DEVICES_NAME, bus_id); -+ SYSFS_BUS_NAME, bus, SYSFS_DEVICES_NAME, bus_id); - - if (stat(sysfs_path, &stat_buf)) - return -1; - -- -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-011-ide-devfs-form-fixes.patch b/sys-fs/udev/files/udev-011-ide-devfs-form-fixes.patch deleted file mode 100644 index e80ef262b117..000000000000 --- a/sys-fs/udev/files/udev-011-ide-devfs-form-fixes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/extras/ide-devfs.sh 2003-12-26 02:04:26.982763656 +0200 -+++ b/extras/ide-devfs.sh 2003-12-26 02:07:28.360190096 +0200 -@@ -4,11 +4,11 @@ - # return devfs-names for ide-devices - # CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c" - --HOST=${2%\.[0-9]} --TARGET=${2#[0-9]\.} -+HOST="${2%\.[0-9]}" -+TARGET="${2#[0-9]\.}" - --if [ -z ${HOST#[13579]} ]; then -- HOST=`expr $HOST - 1` -+if [ -z "${HOST#[13579]}" ]; then -+ HOST=`expr ${HOST} - 1` - BUS="1" - else - BUS="0" -@@ -18,30 +18,30 @@ - local x= - local num=0 - local MEDIA= -- local DRIVE=${1%[0-9]*} -+ local DRIVE="${1%[0-9]*}" - - for x in /proc/ide/*/media; do -- if [ -e "$x" ]; then -- MEDIA=`cat $x` -- if [ "$MEDIA" = "$2" ]; then -- num=`expr $num + 1` -+ if [ -e "${x}" ]; then -+ MEDIA=`cat ${x}` -+ if [ "${MEDIA}" = "$2" ]; then -+ num=`expr ${num} + 1` - fi -- if [ "$x" = "/proc/ide/$DRIVE/media" ]; then -+ if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then - break - fi - fi - done - -- echo `expr $num - 1` -+ echo `expr ${num} - 1` - } - - if [ -z "$3" ]; then -- MEDIA=`cat /proc/ide/$1/media` -- if [ "$MEDIA" = "cdrom" ]; then -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom` -- elif [ "$MEDIA" = "disk" ]; then -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/disc discs/disc`get_dev_number $1 disk`/disc -+ MEDIA=`cat /proc/ide/${1}/media` -+ if [ "${MEDIA}" = "cdrom" ]; then -+ echo ${1} ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom` -+ elif [ "${MEDIA}" = "disk" ]; then -+ echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/disc discs/disc`get_dev_number $1 disk`/disc - fi - else -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3 -+ echo $1 ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3 - fi diff --git a/sys-fs/udev/files/udev-011-ide-devfs.patch b/sys-fs/udev/files/udev-011-ide-devfs.patch deleted file mode 100644 index a9b04d560692..000000000000 --- a/sys-fs/udev/files/udev-011-ide-devfs.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Nru a/namedev.c b/namedev.c ---- a/namedev.c Thu Dec 25 20:27:43 2003 -+++ b/namedev.c Thu Dec 25 20:27:43 2003 -@@ -200,11 +200,12 @@ - case 'D': - if (strlen(udev->kernel_number) == 0) { - strcat(pos, "disc"); -+ dbg("substitute devfs disc"); - break; - } - strcat(pos, "part"); - strcat(pos, udev->kernel_number); -- dbg("substitute kernel number '%s'", udev->kernel_number); -+ dbg("substitute devfs part number '%s'", udev->kernel_number); - break; - case 'm': - sprintf(pos, "%u", udev->minor); -@@ -225,12 +226,14 @@ - num--; - pos3 = strsep(&pos2, " "); - if (pos3 == NULL) { -- dbg("requested part of callout string not found"); -+ dbg("requested part of callout string is empty"); - break; - } - } -- strcat(pos, pos3); -- dbg("substitute partial callout output '%s'", pos3); -+ if (pos3) { -+ strcat(pos, pos3); -+ dbg("substitute partial callout output '%s'", pos3); -+ } - } else { - strcat(pos, udev->callout_value); - dbg("substitute callout output '%s'", udev->callout_value); -diff -Nru a/extras/ide-devfs.sh b/extras/ide-devfs.sh ---- a/extras/ide-devfs.sh Thu Dec 25 23:53:20 2003 -+++ b/extras/ide-devfs.sh Thu Dec 25 23:53:20 2003 -@@ -2,7 +2,7 @@ - - # udev CALLOUT script - # return devfs-names for ide-devices --# CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c" -+# CALLOUT, BUS="ide", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", ID="hd*", NAME="%1c", SYMLINK="%2c %3c" - - HOST=${2%\.[0-9]} - TARGET=${2#[0-9]\.} -@@ -14,14 +14,34 @@ - BUS="0" - fi - -+get_dev_number() { -+ local x= -+ local num=0 -+ local MEDIA= -+ local DRIVE=${1%[0-9]*} -+ -+ for x in /proc/ide/*/media; do -+ if [ -e "$x" ]; then -+ MEDIA=`cat $x` -+ if [ "$MEDIA" = "$2" ]; then -+ num=`expr $num + 1` -+ fi -+ if [ "$x" = "/proc/ide/$DRIVE/media" ]; then -+ break -+ fi -+ fi -+ done -+ -+ echo `expr $num - 1` -+} -+ - if [ -z "$3" ]; then - MEDIA=`cat /proc/ide/$1/media` - if [ "$MEDIA" = "cdrom" ]; then -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/cd -+ echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom` - elif [ "$MEDIA" = "disk" ]; then -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/disc -+ echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/disc discs/disc`get_dev_number $1 disk`/disc - fi - else -- echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/part$3 -+ echo $1 ide/host$HOST/bus$BUS/target$TARGET/lun0/part$3 discs/disc`get_dev_number $1 disk`/part$3 - fi -- diff --git a/sys-fs/udev/files/udev-011-namedev_c-gcc295-compat.patch b/sys-fs/udev/files/udev-011-namedev_c-gcc295-compat.patch deleted file mode 100644 index 9c0fd9b71670..000000000000 --- a/sys-fs/udev/files/udev-011-namedev_c-gcc295-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- namedev.c.orig 2003-12-26 21:03:21.367720136 -0500 -+++ namedev.c 2003-12-26 21:03:28.930570408 -0500 -@@ -655,9 +655,9 @@ - if (isdigit(class_dev->path[strlen(class_dev->path)-1])) { - temp = strrchr(filename, '/'); - if (temp) { -+ char *temp2 = strrchr(filename, '/'); - partition = 1; - *temp = 0x00; -- char *temp2 = strrchr(filename, '/'); - dbg("temp2 = %s", temp2); - if (temp2 && (strcmp(temp2, "/block") == 0)) { - /* oops, we have no parent block device, so go back to original directory */ diff --git a/sys-fs/udev/files/udev-011-unlink-before-symlink.patch b/sys-fs/udev/files/udev-011-unlink-before-symlink.patch deleted file mode 100644 index 66548d8ea000..000000000000 --- a/sys-fs/udev/files/udev-011-unlink-before-symlink.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/udev-add.c 2003-12-26 13:41:06.237311088 +0200 -+++ b/udev-add.c 2003-12-26 13:45:54.004563816 +0200 -@@ -100,6 +100,7 @@ - - static int create_node(struct udevice *dev) - { -+ struct stat stats; - char filename[255]; - char linktarget[255]; - char *linkname; -@@ -221,6 +222,16 @@ - strcpy(linktarget, "./"); - strcat(linktarget, &dev->name[tail]); - -+ /* unlink existing non-directories to ensure that our symlink -+ * is created */ -+ if (lstat(filename, &stats) == 0) { -+ if ((stats.st_mode & S_IFMT) != S_IFDIR) { -+ if (unlink(filename)) -+ dbg("unlink(%s) failed with error '%s'", -+ filename, strerror(errno)); -+ } -+ } -+ - dbg("symlink(%s, %s)", linktarget, filename); - retval = symlink(linktarget, filename); - if (retval) diff --git a/sys-fs/udev/udev-007.ebuild b/sys-fs/udev/udev-007.ebuild deleted file mode 100644 index 91d1f1ae4c77..000000000000 --- a/sys-fs/udev/udev-007.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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-007.ebuild,v 1.1 2003/11/24 18:36:23 azarah Exp $ - -# Note: Cannot use external libsysfs with klibc .. -USE_KLIBC="no" -USE_EXT_LIBSYSFS="no" - -inherit eutils - -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-0.3.0" - -pkg_setup() { - [ "${USE_KLIBC}" = "yes" ] && check_KV - - return 0 -} - -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 - - # Make sure we do not build included libsysfs, but link to - # one in sysfsutils ... - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - rm -rf ${S}/libsysfs - cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs - fi - - # Setup things for klibc - if [ "${USE_KLIBC}" = "yes" ] - then - ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux - fi - - # Do not sefault if we forget to put a ':' between group and permissions - epatch ${FILESDIR}/${P}-check-valid-mode.patch -} - -src_compile() { - # Do not work with emake - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - make udevdir="/dev/" \ - ARCH_LIB_OBJS="-lsysfs" \ - SYSFS="" || die - else - make udevdir="/dev/" || die - fi -} - -src_install() { - into / - dosbin udev - - insinto /etc/udev - doins udev.config - # Our own custom udev.permissions - doins ${FILESDIR}/udev.permissions -# doins udev.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,udev-OLS2003.pdf} -} - diff --git a/sys-fs/udev/udev-008.ebuild b/sys-fs/udev/udev-008.ebuild deleted file mode 100644 index 4c458da450c2..000000000000 --- a/sys-fs/udev/udev-008.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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-008.ebuild,v 1.1 2003/12/14 19:53:29 azarah Exp $ - -# Note: Cannot use external libsysfs with klibc .. -USE_KLIBC="no" -USE_EXT_LIBSYSFS="no" - -inherit eutils - -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-0.3.0" - -pkg_setup() { - [ "${USE_KLIBC}" = "yes" ] && check_KV - - return 0 -} - -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 - - # Make sure we do not build included libsysfs, but link to - # one in sysfsutils ... - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - rm -rf ${S}/libsysfs - cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs - fi - - # Setup things for klibc - if [ "${USE_KLIBC}" = "yes" ] - then - ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux - fi -} - -src_compile() { - # Do not work with emake - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - make udevdir="/dev/" \ - ARCH_LIB_OBJS="-lsysfs" \ - SYSFS="" || die - else - make udevdir="/dev/" || die - fi -} - -src_install() { - into / - dosbin udev - - insinto /etc/udev - doins ${FILESDIR}/udev.conf - doins udev.rules - # Our own custom udev.permissions - doins ${FILESDIR}/udev.permissions -# doins udev.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,udev-OLS2003.pdf} -} - -pkg_preinst() { - if [ -f "${ROOT}/etc/udev/udev.config" -a \ - ! -f "${ROOT}/etc/udev/udev.rules" ] - then - mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules - fi -} - diff --git a/sys-fs/udev/udev-009.ebuild b/sys-fs/udev/udev-009.ebuild deleted file mode 100644 index a0fe7f45673c..000000000000 --- a/sys-fs/udev/udev-009.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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-009.ebuild,v 1.2 2003/12/19 23:05:52 vapier Exp $ - -# Note: Cannot use external libsysfs with klibc .. -USE_KLIBC="no" -USE_EXT_LIBSYSFS="no" - -inherit eutils - -DESCRIPTION="Linux dynamic device naming support (aka userspace devfs)" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ" -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-0.3.0" - -pkg_setup() { - [ "${USE_KLIBC}" = "yes" ] && check_KV - - return 0 -} - -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 - - # Make sure we do not build included libsysfs, but link to - # one in sysfsutils ... - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - rm -rf ${S}/libsysfs - cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs - fi - - # Setup things for klibc - if [ "${USE_KLIBC}" = "yes" ] - then - ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux - fi - - # Fix scsi_id to work with latest libsysfs - epatch ${FILESDIR}/${P}-scsi_id-new-sysfs.patch -} - -src_compile() { - # Do not work with emake - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - make EXTRAS="extras/scsi_id" \ - udevdir="/dev/" \ - ARCH_LIB_OBJS="-lsysfs" \ - SYSFS="" || die - else - make EXTRAS="extras/scsi_id" \ - udevdir="/dev/" || die - fi -} - -src_install() { - into / - dosbin udev - dosbin extras/scsi_id/scsi_id - - insinto /etc/udev - doins ${FILESDIR}/udev.conf - doins udev.rules - # For devfs style layout - doins udev.rules.devfs - # Our own custom udev.permissions - doins ${FILESDIR}/udev.permissions -# doins udev.permissions - insinto /etc - doins extras/scsi_id/scsi_id.config - - dodir /etc/hotplug.d/default - dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug - - doman udev.8 - doman extras/scsi_id/scsi_id.8 - - dodoc COPYING ChangeLog FAQ README TODO - dodoc docs/{overview,udev-OLS2003.pdf} -} - -pkg_preinst() { - if [ -f "${ROOT}/etc/udev/udev.config" -a \ - ! -f "${ROOT}/etc/udev/udev.rules" ] - then - mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules - fi -} - diff --git a/sys-fs/udev/udev-011.ebuild b/sys-fs/udev/udev-011.ebuild deleted file mode 100644 index 0a43c34cb6bb..000000000000 --- a/sys-fs/udev/udev-011.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# 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-011.ebuild,v 1.3 2003/12/29 00:52:46 azarah Exp $ - -# Note: Cannot use external libsysfs with klibc .. -USE_KLIBC="no" -USE_EXT_LIBSYSFS="no" - -inherit eutils - -DESCRIPTION="Linux dynamic device naming support (aka userspace devfs)" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ" -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-0.3.0" - -RDEPEND="${DEPEND} - >=sys-apps/baselayout-1.8.6.12-r3" -# We need some changes for devfs type layout - -pkg_setup() { - [ "${USE_KLIBC}" = "yes" ] && check_KV - - return 0 -} - -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 - - # Make sure there is no sudden changes to udev.rules.devfs - # (more for my own needs than anything else ...) - if [ "`md5sum < "${S}/udev.rules.devfs"`" != \ - "a16769804b6038c7def00012c47b84c5 -" ] - then - echo - eerror "udev.rules.devfs has been updated, please validate!" - die "udev.rules.devfs has been updated, please validate!" - fi - - # Make sure we do not build included libsysfs, but link to - # one in sysfsutils ... - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - rm -rf ${S}/libsysfs - cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs - fi - - # Setup things for klibc - if [ "${USE_KLIBC}" = "yes" ] - then - ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux - fi - - # Improve ide devfs symlink stuff - epatch ${FILESDIR}/${P}-ide-devfs.patch - # Some quoting/brace fixes - epatch ${FILESDIR}/${P}-ide-devfs-form-fixes.patch - - # Do not sleep if UDEV_NO_SLEEP is set - epatch ${FILESDIR}/${P}-no-wait-for-sleep.patch - - # First unlink an existing file/symlink/node/fifo/socket *before* - # we create a symlink, else it will fail. - epatch ${FILESDIR}/${P}-unlink-before-symlink.patch - - # Fix gcc-2.95.3 compat, bug #36556 - epatch ${FILESDIR}/${P}-namedev_c-gcc295-compat.patch -} - -src_compile() { - # Do not work with emake - if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ] - then - make EXTRAS="extras/scsi_id" \ - udevdir="/dev/" \ - ARCH_LIB_OBJS="-lsysfs" \ - SYSFS="" || die - else - make EXTRAS="extras/scsi_id" \ - udevdir="/dev/" || die - fi -} - -src_install() { - into / - dosbin udev - dosbin extras/scsi_id/scsi_id - - exeinto /etc/udev/scripts - doexe extras/ide-devfs.sh - - insinto /etc/udev - doins ${FILESDIR}/udev.conf -# newins udev.rules udev.rules.example - # For devfs style layout - doins ${FILESDIR}/udev.rules - # Our own custom udev.permissions - doins ${FILESDIR}/udev.permissions -# doins udev.permissions - insinto /etc - doins extras/scsi_id/scsi_id.config - - dodir /etc/hotplug.d/default - dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug - - doman udev.8 - doman extras/scsi_id/scsi_id.8 - - dodoc COPYING ChangeLog FAQ README TODO - dodoc docs/{overview,udev-OLS2003.pdf} -} - -pkg_preinst() { - if [ -f "${ROOT}/etc/udev/udev.config" -a \ - ! -f "${ROOT}/etc/udev/udev.rules" ] - then - mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules - fi -} - |