From 0991a596033c586def7e9cfb3c3e19ea96d8aee0 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Sun, 8 Feb 2004 16:59:29 +0000 Subject: Comment examples in udev.rules as they cause issues. Bump version to propagate this change. Closes bug #40758. --- sys-fs/udev/ChangeLog | 9 ++- sys-fs/udev/Manifest | 8 +- sys-fs/udev/files/digest-udev-016-r1 | 1 + sys-fs/udev/files/udev.rules.post_012 | 31 ++++---- sys-fs/udev/udev-016-r1.ebuild | 143 ++++++++++++++++++++++++++++++++++ 5 files changed, 170 insertions(+), 22 deletions(-) create mode 100644 sys-fs/udev/files/digest-udev-016-r1 create mode 100644 sys-fs/udev/udev-016-r1.ebuild (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index e6e934d52f84..cb326092f6ef 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.24 2004/02/03 21:47:04 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.25 2004/02/08 16:59:28 azarah Exp $ + +*udev-016-r1 (08 Feb 2004) + + 08 Feb 2004; Martin Schlemmer udev-016-r1.ebuild, + files/udev.rules.post_012: + Comment examples in udev.rules as they cause issues. Bump version to propagate + this change. Closes bug #40758. *udev-016 (03 Feb 2004) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 277163d553a2..082411f21458 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,21 +1,23 @@ MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343 MD5 813397f1f9255c1b8c5e05e67b182938 udev-013-r1.ebuild 3352 -MD5 abb2d02a2710914011723aa7fdcc16d3 ChangeLog 5979 +MD5 38c6c935931841bba9ea1a48f9ce5067 ChangeLog 6224 MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400 MD5 1001a80c31740e12beee81fe73e95f37 udev-015.ebuild 3761 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 1be180295c05c44871bf03615d021d8c udev-016.ebuild 3685 +MD5 6e606dd9cbb678ec159fa23e6236cdb1 udev-016-r1.ebuild 3699 +MD5 2c21cbe4ae8af4ccc55ddd95d6442bd7 udev-016.ebuild 3696 MD5 dbe7dc643caeafddc845fe9269430123 files/udev-011-no-wait-for-sleep.patch 1053 MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013-r1 62 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016 62 +MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r1 62 MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277 MD5 194ac8ffc6c63327f8802eec5aeb7811 files/udev-015-sysbus-missing-include.patch 305 MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62 MD5 ea8dcace65aa8d8071236e48ec1684af files/udev-015-logging-config-option.patch 4332 MD5 8b2a4466a30de6474690e3f93703457b files/digest-udev-015 62 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62 -MD5 fb416fb7ea84ca08f4c1c697248beac2 files/udev.rules.post_012 4355 +MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185 MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070 MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617 diff --git a/sys-fs/udev/files/digest-udev-016-r1 b/sys-fs/udev/files/digest-udev-016-r1 new file mode 100644 index 000000000000..32af573daa78 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-016-r1 @@ -0,0 +1 @@ +MD5 5724a5b7b1756fc948402bf98173a04c udev-016.tar.bz2 1090264 diff --git a/sys-fs/udev/files/udev.rules.post_012 b/sys-fs/udev/files/udev.rules.post_012 index 0772061b2935..7b35d08a465d 100644 --- a/sys-fs/udev/files/udev.rules.post_012 +++ b/sys-fs/udev/files/udev.rules.post_012 @@ -1,48 +1,43 @@ # /etc/udev/udev.rules: device naming rules for udev -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.4 2004/01/29 18:39:19 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.5 2004/02/08 16:59:29 azarah Exp $ # # There are a number of modifiers that are allowed to be used in some of the # fields. See the udev man page for a full description of them. ########################################################### # -# Add your own rules here +# Add your own rules here (examples are commented) # ########################################################### -# LS120 -LABEL, BUS="scsi", SYSFS_model="LS-120 COSM 04", NAME="afd" -LABEL, BUS="scsi", SYSFS_vendor="MATSHITA", NAME="afd" -CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="LS-120 COSM 04", NAME="afd" - # Looking for scsi bus id 42:0:0:1 -BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c" +#BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c" # A usb camera. -BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n" +#BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n" # USB Epson printer to be called lp_epson -BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson" +#BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson" # USB HP printer to be called lp_hp -BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp" +#BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp" # sound card with PCI bus id 00:0b.0 to be the first sound card -BUS="pci", ID="00:0b.0", NAME="dsp" +#BUS="pci", ID="00:0b.0", NAME="dsp" # sound card with PCI bus id 00:07.1 to be the second sound card -BUS="pci", ID="00:07.1", NAME="dsp1" +#BUS="pci", ID="00:07.1", NAME="dsp1" # USB mouse plugged into the third port of the first hub to be called mouse0 -BUS="usb", PLACE="1.3", NAME="mouse0" +#BUS="usb", PLACE="1.3", NAME="mouse0" # USB tablet plugged into the third port of the second hub to be called mouse1 -BUS="usb", PLACE="2.3", NAME="mouse1" -BUS="usb", PLACE="2.4", NAME="mouse2" +#BUS="usb", PLACE="2.3", NAME="mouse1" +#BUS="usb", PLACE="2.4", NAME="mouse2" # ttyUSB1 should always be called visor -KERNEL="ttyUSB1", NAME="visor" -KERNEL="ttyUSB0", NAME="pl2303" +#KERNEL="ttyUSB1", NAME="visor" +#KERNEL="ttyUSB0", NAME="pl2303" ########################################################### diff --git a/sys-fs/udev/udev-016-r1.ebuild b/sys-fs/udev/udev-016-r1.ebuild new file mode 100644 index 000000000000..c848a3af55ca --- /dev/null +++ b/sys-fs/udev/udev-016-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-016-r1.ebuild,v 1.1 2004/02/08 16:59:28 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 ~ppc ~hppa ~amd64" + +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}/etc/udev/udev.rules.devfs"`" != \ + "39311afa517b232c6a860371f009d2df -" ] + 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 + + # Do not sleep if UDEV_NO_SLEEP is set + epatch ${FILESDIR}/${PN}-015-no-wait-for-sleep.patch + + # Make logging a udev.conf option + epatch ${FILESDIR}/${P}-logging-config-option.patch +} + +src_compile() { + local myconf= + + # DBUS support? + if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null + then + myconf="USE_DBUS=true" + fi + + # 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="" \ + ${myconf} || die + else + make EXTRAS="extras/scsi_id" \ + udevdir="/dev/" \ + ${myconf} || die + fi +} + +src_install() { + dobin udevinfo + into / + dosbin udev + # *** Note that we do not yet use or install udevd and udevsend, *** + # *** as they seem to be still too buggy (udevsend do not even *** + # *** start udevd over here ... *** +# dosbin udevd udevsend + dosbin extras/scsi_id/scsi_id + + exeinto /etc/udev/scripts + doexe extras/ide-devfs.sh + + insinto /etc/udev + doins ${FILESDIR}/udev.conf +# newins etc/udev/udev.rules udev.rules.example + # For devfs style layout + newins ${FILESDIR}/udev.rules.post_012 udev.rules + # Our own custom udev.permissions + doins ${FILESDIR}/udev.permissions +# doins etc/udev/udev.permissions + insinto /etc + doins extras/scsi_id/scsi_id.config + # DBUS support? + if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null + then + insinto /etc/dbus-1/system.d + doins etc/dbus-1/system.d/udev_sysbus_policy.conf + fi + + dodir /etc/hotplug.d/default + dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug + + doman *.8 + doman extras/scsi_id/scsi_id.8 + + dodoc COPYING ChangeLog FAQ README TODO + dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs} +} + +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 +} -- cgit v1.2.3-65-gdbad