From c76a260bce3bd666832aa4da3ee870b1d8b43f71 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Sep 2005 16:51:27 +0000 Subject: udev: Add the devfs udev 'comaptiblity' rules to OE as it changes names in different versions of udev. We *really* don't want to be using these. --- packages/udev/files/devfs-udev.rules | 108 +++++++++++++++++++++++++++++++++++ packages/udev/udev.inc | 3 +- packages/udev/udev_058.bb | 2 +- packages/udev/udev_063.bb | 2 +- packages/udev/udev_065.bb | 2 +- packages/udev/udev_070.bb | 2 +- 6 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 packages/udev/files/devfs-udev.rules diff --git a/packages/udev/files/devfs-udev.rules b/packages/udev/files/devfs-udev.rules new file mode 100644 index 0000000000..0ba1ad4e7f --- /dev/null +++ b/packages/udev/files/devfs-udev.rules @@ -0,0 +1,108 @@ +# The use of these rules is not recommended or supported. +# In a world where devices can come and go at any time, the devfs scheme +# of simple device enumeration does not help _anything_. Just forget about +# it. Use custom rules to name your device or look at the persistent device +# naming scheme, which is implemented for disks and add your subsystem. + +# ide block devices +BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}" + +# md block devices +KERNEL="md[0-9]*", NAME="md/%n" + +# floppy devices +KERNEL="fd[0-9]*", NAME="floppy/%n" + +# tty devices +KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" +KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" +KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" + +# vc devices +KERNEL="vcs", NAME="vcc/0" +KERNEL="vcs[0-9]*", NAME="vcc/%n" +KERNEL="vcsa", NAME="vcc/a0" +KERNEL="vcsa[0-9]*", NAME="vcc/a%n" + +# v4l devices +KERNEL="video[0-9]*", NAME="v4l/video%n" +KERNEL="radio[0-9]*", NAME="v4l/radio%n" +KERNEL="vbi[0-9]*", NAME="v4l/vbi%n" +KERNEL="vtx[0-9]*", NAME="v4l/vtx%n" + +# dm devices (ignore them) +KERNEL="dm-[0-9]*", NAME="" + +# i2c devices +KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k" + +# loop devices +KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k" + +# ramdisks +KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k" + +# framebuffer devices +KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k" + +# misc +KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" +KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" +KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k" +KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" +KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" +KERNEL="uinput", NAME="misc/%k", SYMLINK="%k" + +# alsa devices +KERNEL="controlC[0-9]*", NAME="snd/%k" +KERNEL="hw[CD0-9]*", NAME="snd/%k" +KERNEL="pcm[CD0-9cp]*", NAME="snd/%k" +KERNEL="midi[CD0-9]*", NAME="snd/%k" +KERNEL="timer", NAME="snd/%k" +KERNEL="seq", NAME="snd/%k" + +# oss devices +KERNEL="audio*", NAME="sound/%k", SYMLINK="%k" +KERNEL="dmmidi", NAME="sound/%k", SYMLINK="%k" +KERNEL="dsp*", NAME="sound/%k", SYMLINK="%k" +KERNEL="midi*", NAME="sound/%k", SYMLINK="%k" +KERNEL="mixer*", NAME="sound/%k", SYMLINK="%k" +KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k" + +# input devices +KERNEL="mice", NAME="input/%k" +KERNEL="mouse*", NAME="input/%k" +KERNEL="event*", NAME="input/%k" +KERNEL="js*", NAME="input/%k" +KERNEL="ts*", NAME="input/%k" + +# USB devices +KERNEL="hiddev*", NAME="usb/%k" +KERNEL="auer*", NAME="usb/%k" +KERNEL="legousbtower*", NAME="usb/%k" +KERNEL="dabusb*", NAME="usb/%k" +BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" + +# netlink devices +KERNEL="route", NAME="netlink/%k" +KERNEL="skip", NAME="netlink/%k" +KERNEL="usersock", NAME="netlink/%k" +KERNEL="fwmonitor", NAME="netlink/%k" +KERNEL="tcpdiag", NAME="netlink/%k" +KERNEL="nflog", NAME="netlink/%k" +KERNEL="xfrm", NAME="netlink/%k" +KERNEL="arpd", NAME="netlink/%k" +KERNEL="route6", NAME="netlink/%k" +KERNEL="ip6_fw", NAME="netlink/%k" +KERNEL="dnrtmsg", NAME="netlink/%k" +KERNEL="tap*", NAME="netlink/%k" + +# CAPI devices +KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20" +KERNEL="capi*", NAME="capi/%n" + +# Network devices +KERNEL="tun", NAME="net/%k" + +# raw devices +KERNEL="raw[0-9]*", NAME="raw/%k" diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 9ab17e87f4..2387d07945 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -4,6 +4,7 @@ LICENSE = "GPL" SRC_URI += " \ file://udev.rules \ + file://devfs-udev.rules \ file://links.conf \ file://permissions.rules \ file://mount.sh \ @@ -49,7 +50,7 @@ do_install () { install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules if [ "${UDEV_DEVFS_RULES}" = "1" ]; then - install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi install -d ${D}${sysconfdir}/udev/scripts/ diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb index 21c05dbff7..4c346b9ab7 100644 --- a/packages/udev/udev_058.bb +++ b/packages/udev/udev_058.bb @@ -7,5 +7,5 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r4" +PR = "r5" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/" diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb index 5d2beef8f2..bf80af8131 100644 --- a/packages/udev/udev_063.bb +++ b/packages/udev/udev_063.bb @@ -7,7 +7,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r3" +PR = "r4" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" #FIXME UDEV MIGRATION PLAN: diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb index e3aa9b03a8..d05a8b84b7 100644 --- a/packages/udev/udev_065.bb +++ b/packages/udev/udev_065.bb @@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r1" +PR = "r2" UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" #FIXME UDEV MIGRATION PLAN: diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb index 8b4181b363..dfc20eb5b4 100644 --- a/packages/udev/udev_070.bb +++ b/packages/udev/udev_070.bb @@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r2" +PR = "r3" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" -- cgit v1.2.3