diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-05-16 15:37:36 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-05-16 15:38:23 +0200 |
commit | 88295fc7dd7bf79b6eb2decfc64467defe829df8 (patch) | |
tree | c078ea48648d3c9336060d880e558ca5347cf90e /meta-oe/recipes-core/udev | |
parent | 0d8c7ffcace1b462e4becdd7c802dbf8e2c03af7 (diff) | |
download | meta-openembedded-88295fc7dd7bf79b6eb2decfc64467defe829df8.tar.gz |
udev: update to 168
This also removes machine specific files
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core/udev')
39 files changed, 210 insertions, 1176 deletions
diff --git a/meta-oe/recipes-core/udev/udev-165/akita/default b/meta-oe/recipes-core/udev/udev-165/akita/default deleted file mode 100644 index d0050b873..000000000 --- a/meta-oe/recipes-core/udev/udev-165/akita/default +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # Default for /etc/init.d/udev | ||
2 | |||
3 | # Comment this out to disable device cache | ||
4 | #DEVCACHE="/etc/dev.tar" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/bug/10-mx31.rules b/meta-oe/recipes-core/udev/udev-165/bug/10-mx31.rules deleted file mode 100644 index de427fc8b..000000000 --- a/meta-oe/recipes-core/udev/udev-165/bug/10-mx31.rules +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | KERNEL=="ttyS[0-9]", NAME="tts/%n", SYMLINK+="tts%n" | ||
2 | KERNEL=="ttymxc[0-9]", NAME="ttymxc/%n", SYMLINK+="ttymxc%n" | ||
3 | |||
4 | KERNEL=="mxc_mu[0-9]", NAME="mxc_mu/%n", SYMLINK+="mxc_mu%n" | ||
5 | KERNEL=="fb*", NAME="fb/%n", SYMLINK+="fb%n" | ||
6 | KERNEL=="i2c*", NAME="i2c/%n" | ||
7 | KERNEL=="mxc_ipc*", NAME="mxc_ipc/%n" | ||
8 | KERNEL=="video*", NAME="v4l/video%n" | ||
9 | |||
10 | KERNEL=="rtc", NAME="misc/rtc" | ||
11 | KERNEL=="watchdog", NAME="misc/watchdog" | ||
12 | |||
13 | KERNEL=="mc13783_adc", NAME="mc13783_adc", SYMLINK+="ts" | ||
14 | KERNEL=="pmic_adc", NAME="pmic_adc", SYMLINK+="ts" | ||
15 | |||
16 | # The long class name gets cut off to be mc13783_connectiv in | ||
17 | # /sys/class/mc13783_connectivity/mc13783_connectivit | ||
18 | KERNEL=="mc13783_connectiv*", NAME="mc13783_connectivity" | ||
19 | |||
20 | KERNEL=="mxc_ssi[0-9]*", NAME="mxc_ssi/%n", SYMLINK+="mxc_ssi%n" | ||
21 | KERNEL=="spi[0-9]*", NAME="spi/%n", SYMLINK+="spi%n" | ||
22 | |||
23 | KERNEL=="mtdblock*", NAME="mtdblock/%n" SYMLINK+="mtdblock%n" | ||
24 | KERNEL=="mtd[0-9]", NAME="mtd/%n" | ||
25 | |||
26 | # A more elegant way of doing this must exist... | ||
27 | KERNEL=="mtd0ro", NAME="mtd/0ro" | ||
28 | KERNEL=="mtd1ro", NAME="mtd/1ro" | ||
29 | KERNEL=="mtd2ro", NAME="mtd/2ro" | ||
30 | KERNEL=="mtd3ro", NAME="mtd/3ro" | ||
31 | KERNEL=="mtd4ro", NAME="mtd/4ro" | ||
32 | KERNEL=="mtd5ro", NAME="mtd/5ro" | ||
33 | KERNEL=="mtd6ro", NAME="mtd/6ro" | ||
34 | KERNEL=="mtd7ro", NAME="mtd/7ro" | ||
35 | KERNEL=="mtd8ro", NAME="mtd/8ro" | ||
36 | KERNEL=="mtd9ro", NAME="mtd/9ro" | ||
37 | |||
38 | # Note that we want /dev/dsp linked to /dev/sound/dsp1... | ||
39 | KERNEL=="dsp", NAME="sound/dsp" | ||
40 | KERNEL=="dspW", NAME="sound/dspW" | ||
41 | KERNEL=="dsp1", NAME="sound/dsp1", SYMLINK+="dsp" | ||
42 | KERNEL=="mixer", NAME="sound/mixer", SYMLINK+="mixer" | ||
43 | KERNEL=="sequencer", NAME="sound/sequencer" | ||
44 | KERNEL=="sequencer2", NAME="sound/sequencer2" | ||
45 | |||
46 | KERNEL=="ram[0-9]*", NAME="ram/%n", SYMLINK+="ram%n" | ||
47 | |||
48 | KERNEL=="dvfs_dptc", NAME="dvfs_dptc", SYMLINK+="dptc dvfs" | ||
49 | |||
diff --git a/meta-oe/recipes-core/udev/udev-165/bug/30-BUG.rules b/meta-oe/recipes-core/udev/udev-165/bug/30-BUG.rules deleted file mode 100644 index 06faa6bb9..000000000 --- a/meta-oe/recipes-core/udev/udev-165/bug/30-BUG.rules +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | ## | ||
2 | ## BUG/BMI specific | ||
3 | ## | ||
4 | KERNEL=="event*", ATTRS{name}=="bugnav", SYMLINK+="input/bugnav" | ||
5 | KERNEL=="event*", ATTRS{name}=="bmi_motion", SYMLINK+="input/bmi_motion" | ||
6 | KERNEL=="event*", ATTRS{name}=="bug_cam", SYMLINK+="input/bmi_cam" | ||
7 | KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m1", SYMLINK+="input/bmi_audio_m1" | ||
8 | KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m2", SYMLINK+="input/bmi_audio_m2" | ||
9 | KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m3", SYMLINK+="input/bmi_audio_m3" | ||
10 | KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m4", SYMLINK+="input/bmi_audio_m4" | ||
11 | DEVPATH=="/devices/platform/bugfb.0", SYMLINK+="bugfb" | ||
12 | KERNEL=="rtc0", SYMLINK+="rtc" | ||
13 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts0", SYMLINK+="input/bmi_lcd_ts0" | ||
14 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts1", SYMLINK+="input/bmi_lcd_ts1" | ||
15 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts2", SYMLINK+="input/bmi_lcd_ts2" | ||
16 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts3", SYMLINK+="input/bmi_lcd_ts3" | ||
17 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts4", SYMLINK+="input/bmi_lcd_ts4" | ||
18 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts5", SYMLINK+="input/bmi_lcd_ts5" | ||
19 | KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts6", SYMLINK+="input/bmi_lcd_ts6" | ||
20 | ACTION=="add", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" | ||
21 | ACTION=="remove", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" | ||
22 | # | ||
23 | # For USB PBPSD, which we've arbitrarily decided will be module F001 | ||
24 | # | ||
25 | ACTION=="remove", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" | ||
26 | ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh b/meta-oe/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh deleted file mode 100644 index acbae5611..000000000 --- a/meta-oe/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # This script passes BMI state variables to the running JVM. | ||
4 | # | ||
5 | if [ ${BMIBUS_PRODUCT} != "" ] && [ ${BMIBUS_SLOT} != "" ] && [ ${ACTION} != "" ]; | ||
6 | then | ||
7 | echo $BMIBUS_PRODUCT 0 $BMIBUS_SLOT $ACTION > /tmp/eventpipe | ||
8 | fi | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/c7x0/default b/meta-oe/recipes-core/udev/udev-165/c7x0/default deleted file mode 100644 index d0050b873..000000000 --- a/meta-oe/recipes-core/udev/udev-165/c7x0/default +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # Default for /etc/init.d/udev | ||
2 | |||
3 | # Comment this out to disable device cache | ||
4 | #DEVCACHE="/etc/dev.tar" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/init b/meta-oe/recipes-core/udev/udev-165/init deleted file mode 100644 index 7ec32afd0..000000000 --- a/meta-oe/recipes-core/udev/udev-165/init +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | |||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: udev | ||
5 | # Required-Start: mountvirtfs | ||
6 | # Required-Stop: | ||
7 | # Default-Start: S | ||
8 | # Default-Stop: | ||
9 | # Short-Description: Start udevd, populate /dev and load drivers. | ||
10 | ### END INIT INFO | ||
11 | |||
12 | export TZ=/etc/localtime | ||
13 | |||
14 | [ -d /sys/class ] || exit 1 | ||
15 | [ -r /proc/mounts ] || exit 1 | ||
16 | [ -x /sbin/udevd ] || exit 1 | ||
17 | [ -f /etc/default/udev ] && . /etc/default/udev | ||
18 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf | ||
19 | |||
20 | kill_udevd() { | ||
21 | if [ -x /sbin/pidof ]; then | ||
22 | pid=`/sbin/pidof -x udevd` | ||
23 | [ -n "$pid" ] && kill $pid | ||
24 | fi | ||
25 | } | ||
26 | |||
27 | export ACTION=add | ||
28 | # propagate /dev from /sys | ||
29 | echo "Starting udev" | ||
30 | |||
31 | # mount the tmpfs on /dev, if not already done | ||
32 | LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { | ||
33 | mount -n -o mode=0755 -t tmpfs none "/dev" | ||
34 | mkdir -m 0755 /dev/pts | ||
35 | mkdir -m 1777 /dev/shm | ||
36 | } | ||
37 | |||
38 | if [ "$DEVCACHE" != "" ]; then | ||
39 | # Invalidate udev cache if the kernel or its bootargs/cmdline have changed | ||
40 | [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname | ||
41 | [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline | ||
42 | [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags | ||
43 | if [ -e $DEVCACHE ] && \ | ||
44 | cmp -s /tmp/uname /etc/udev/saved.uname && \ | ||
45 | cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ | ||
46 | cmp -s /tmp/atags /etc/udev/saved.atags; then | ||
47 | (cd /; tar xf $DEVCACHE > /dev/null 2>&1) | ||
48 | not_first_boot=1 | ||
49 | fi | ||
50 | fi | ||
51 | |||
52 | if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then | ||
53 | mkdir -p /lib/modules/$(uname -r) | ||
54 | depmod -ae | ||
55 | fi | ||
56 | |||
57 | # make_extra_nodes | ||
58 | kill_udevd > "/dev/null" 2>&1 | ||
59 | |||
60 | # trigger the sorted events | ||
61 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | ||
62 | /sbin/udevd -d | ||
63 | |||
64 | /sbin/udevadm control --env STARTUP=1 | ||
65 | if [ "$not_first_boot" != "" ];then | ||
66 | /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform | ||
67 | (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)& | ||
68 | else | ||
69 | /sbin/udevadm trigger | ||
70 | /sbin/udevadm settle | ||
71 | fi | ||
72 | |||
73 | exit 0 | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/local.rules b/meta-oe/recipes-core/udev/udev-165/local.rules deleted file mode 100644 index da4b38593..000000000 --- a/meta-oe/recipes-core/udev/udev-165/local.rules +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # Media automounting | ||
17 | SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" | ||
18 | SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" | ||
19 | |||
20 | # Handle network interface setup | ||
21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" | ||
22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" | ||
23 | |||
24 | # The first rtc device is symlinked to /dev/rtc | ||
25 | KERNEL=="rtc0", SYMLINK+="rtc" | ||
26 | |||
27 | #The first framebuffer is symlinked to /dev/fb | ||
28 | KERNEL=="fb0", SYMLINK+="fb" | ||
29 | |||
30 | # Try and modprobe for drivers for new hardware | ||
31 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
32 | |||
33 | # Create a symlink to any touchscreen input device | ||
34 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
35 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/omap3-pandora/local.rules b/meta-oe/recipes-core/udev/udev-165/omap3-pandora/local.rules deleted file mode 100644 index e433cf959..000000000 --- a/meta-oe/recipes-core/udev/udev-165/omap3-pandora/local.rules +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # Media automounting | ||
17 | SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" | ||
18 | SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" | ||
19 | |||
20 | # Handle network interface setup | ||
21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" | ||
22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" | ||
23 | |||
24 | # The first rtc device is symlinked to /dev/rtc | ||
25 | KERNEL=="rtc0", SYMLINK+="rtc" | ||
26 | |||
27 | #The first framebuffer is symlinked to /dev/fb | ||
28 | KERNEL=="fb0", SYMLINK+="fb" | ||
29 | |||
30 | # Try and modprobe for drivers for new hardware | ||
31 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
32 | |||
33 | # Create a symlink to any touchscreen input device | ||
34 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
35 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" | ||
36 | |||
37 | # Local UDEV rule changes for the Pandora system. | ||
38 | |||
39 | # Let all users access the event devices using EVDEV (the OpenPandora is not multiuser after all). | ||
40 | KERNEL=="event[0-9]",MODE="0666" \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/permissions.rules b/meta-oe/recipes-core/udev/udev-165/permissions.rules deleted file mode 100644 index f4f94a6db..000000000 --- a/meta-oe/recipes-core/udev/udev-165/permissions.rules +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | ACTION!="add", GOTO="permissions_end" | ||
2 | |||
3 | # devices needed to load the drivers providing them | ||
4 | KERNEL=="tun", OPTIONS+="ignore_remove" | ||
5 | KERNEL=="ppp", OPTIONS+="ignore_remove" | ||
6 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | ||
7 | |||
8 | # default permissions for block devices | ||
9 | SUBSYSTEM=="block", GROUP="disk" | ||
10 | # the aacraid driver is broken and reports that disks removable (see #404927) | ||
11 | SUBSYSTEM=="block", ATTRS{removable}=="1", \ | ||
12 | DRIVERS!="aacraid", GROUP="floppy" | ||
13 | # all block devices on these buses are "removable" | ||
14 | SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" | ||
15 | |||
16 | # IDE devices | ||
17 | KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ | ||
18 | IMPORT{program}="cdrom_id --export $tempnode" | ||
19 | ENV{ID_CDROM}=="?*", GROUP="cdrom" | ||
20 | KERNEL=="ht[0-9]*", GROUP="tape" | ||
21 | KERNEL=="nht[0-9]*", GROUP="tape" | ||
22 | |||
23 | # SCSI devices | ||
24 | KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" | ||
25 | SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" | ||
26 | SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" | ||
27 | SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" | ||
28 | SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" | ||
29 | |||
30 | # USB devices | ||
31 | KERNEL=="legousbtower*", MODE="0666" | ||
32 | KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" | ||
33 | |||
34 | # usbfs-like devices | ||
35 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ | ||
36 | MODE="0664" | ||
37 | |||
38 | # iRiver music players | ||
39 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ | ||
40 | ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" | ||
41 | |||
42 | # serial devices | ||
43 | SUBSYSTEM=="tty", GROUP="dialout" | ||
44 | SUBSYSTEM=="capi", GROUP="dialout" | ||
45 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
46 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
47 | |||
48 | # vc devices (all members of the tty subsystem) | ||
49 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
50 | KERNEL=="console", MODE="0600", GROUP="root" | ||
51 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
52 | KERNEL=="tty[0-9]*", GROUP="root" | ||
53 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
54 | |||
55 | # video devices | ||
56 | SUBSYSTEM=="video4linux", GROUP="video" | ||
57 | SUBSYSTEM=="drm", GROUP="video" | ||
58 | SUBSYSTEM=="dvb", GROUP="video" | ||
59 | SUBSYSTEM=="em8300", GROUP="video" | ||
60 | SUBSYSTEM=="graphics", GROUP="video" | ||
61 | SUBSYSTEM=="nvidia", GROUP="video" | ||
62 | |||
63 | # misc devices | ||
64 | KERNEL=="random", MODE="0666" | ||
65 | KERNEL=="urandom", MODE="0666" | ||
66 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
67 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
68 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
69 | KERNEL=="full", MODE="0666" | ||
70 | KERNEL=="null", MODE="0666" | ||
71 | KERNEL=="zero", MODE="0666" | ||
72 | KERNEL=="inotify", MODE="0666" | ||
73 | KERNEL=="sgi_fetchop", MODE="0666" | ||
74 | KERNEL=="sonypi", MODE="0666" | ||
75 | KERNEL=="agpgart", GROUP="video" | ||
76 | KERNEL=="rtc|rtc[0-9]*", GROUP="audio" | ||
77 | KERNEL=="kqemu", MODE="0666" | ||
78 | KERNEL=="tun", MODE="0666", | ||
79 | |||
80 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
81 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
82 | KERNEL=="pktcdvd", MODE="0644" | ||
83 | |||
84 | # printers and parallel devices | ||
85 | SUBSYSTEM=="printer", GROUP="lp" | ||
86 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
87 | KERNEL=="irlpt*", GROUP="lp" | ||
88 | KERNEL=="pt[0-9]*", GROUP="tape" | ||
89 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
90 | |||
91 | # sound devices | ||
92 | SUBSYSTEM=="sound", GROUP="audio" | ||
93 | |||
94 | # ieee1394 devices | ||
95 | KERNEL=="raw1394", GROUP="disk" | ||
96 | KERNEL=="dv1394*", GROUP="video" | ||
97 | KERNEL=="video1394*", GROUP="video" | ||
98 | |||
99 | # input devices | ||
100 | KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ | ||
101 | MODE="0664", GROUP="video" | ||
102 | KERNEL=="js[0-9]*", MODE="0664" | ||
103 | KERNEL=="lirc[0-9]*", GROUP="video" | ||
104 | |||
105 | # AOE character devices | ||
106 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
107 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
108 | |||
109 | LABEL="permissions_end" | ||
110 | |||
diff --git a/meta-oe/recipes-core/udev/udev-165/spitz/default b/meta-oe/recipes-core/udev/udev-165/spitz/default deleted file mode 100644 index d0050b873..000000000 --- a/meta-oe/recipes-core/udev/udev-165/spitz/default +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # Default for /etc/init.d/udev | ||
2 | |||
3 | # Comment this out to disable device cache | ||
4 | #DEVCACHE="/etc/dev.tar" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/tosa/default b/meta-oe/recipes-core/udev/udev-165/tosa/default deleted file mode 100644 index d0050b873..000000000 --- a/meta-oe/recipes-core/udev/udev-165/tosa/default +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # Default for /etc/init.d/udev | ||
2 | |||
3 | # Comment this out to disable device cache | ||
4 | #DEVCACHE="/etc/dev.tar" | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/udev.rules b/meta-oe/recipes-core/udev/udev-165/udev.rules deleted file mode 100644 index c20cdcc15..000000000 --- a/meta-oe/recipes-core/udev/udev-165/udev.rules +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # workaround for devices which do not report media changes | ||
17 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ | ||
18 | ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions" | ||
19 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ | ||
20 | OPTIONS+="all_partitions" | ||
21 | |||
22 | # SCSI devices | ||
23 | SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" | ||
24 | |||
25 | # USB devices | ||
26 | SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
27 | SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
28 | SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | ||
29 | SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | ||
30 | SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | ||
31 | SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | ||
32 | SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ | ||
33 | ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ | ||
34 | SYMLINK+="pilot" | ||
35 | |||
36 | # usbfs-like devices | ||
37 | SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ | ||
38 | NAME="%c" | ||
39 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" | ||
40 | |||
41 | # serial devices | ||
42 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | ||
43 | KERNEL=="capi[0-9]*", NAME="capi/%n" | ||
44 | |||
45 | # video devices | ||
46 | KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ | ||
47 | NAME="%c" | ||
48 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
49 | |||
50 | # misc devices | ||
51 | KERNEL=="hw_random", NAME="hwrng" | ||
52 | KERNEL=="tun", NAME="net/%k" | ||
53 | KERNEL=="evtchn", NAME="xen/%k" | ||
54 | |||
55 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | ||
56 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | ||
57 | KERNEL=="pktcdvd", NAME="pktcdvd/control" | ||
58 | |||
59 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" | ||
60 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
61 | KERNEL=="microcode", NAME="cpu/microcode" | ||
62 | |||
63 | KERNEL=="umad*", NAME="infiniband/%k" | ||
64 | KERNEL=="issm*", NAME="infiniband/%k" | ||
65 | KERNEL=="uverbs*", NAME="infiniband/%k" | ||
66 | KERNEL=="ucm*", NAME="infiniband/%k" | ||
67 | KERNEL=="rdma_ucm", NAME="infiniband/%k" | ||
68 | |||
69 | # ALSA devices | ||
70 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
71 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
72 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
73 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
74 | KERNEL=="timer", NAME="snd/%k" | ||
75 | KERNEL=="seq", NAME="snd/%k" | ||
76 | |||
77 | # ieee1394 devices | ||
78 | KERNEL=="dv1394*", NAME="dv1394/%n" | ||
79 | KERNEL=="video1394*", NAME="video1394/%n" | ||
80 | |||
81 | # input devices | ||
82 | KERNEL=="mice", NAME="input/%k" | ||
83 | KERNEL=="mouse[0-9]*", NAME="input/%k" | ||
84 | KERNEL=="event[0-9]*", NAME="input/%k" | ||
85 | KERNEL=="js[0-9]*", NAME="input/%k" | ||
86 | KERNEL=="ts[0-9]*", NAME="input/%k" | ||
87 | KERNEL=="uinput", NAME="input/%k" | ||
88 | |||
89 | # Zaptel | ||
90 | KERNEL=="zapctl", NAME="zap/ctl" | ||
91 | KERNEL=="zaptimer", NAME="zap/timer" | ||
92 | KERNEL=="zapchannel", NAME="zap/channel" | ||
93 | KERNEL=="zappseudo", NAME="zap/pseudo" | ||
94 | KERNEL=="zap[0-9]*", NAME="zap/%n" | ||
95 | |||
96 | # AOE character devices | ||
97 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | ||
98 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | ||
99 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | ||
100 | SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" | ||
101 | |||
102 | # device mapper creates its own device nodes, so ignore these | ||
103 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | ||
104 | KERNEL=="device-mapper", NAME="mapper/control" | ||
105 | |||
106 | KERNEL=="rfcomm[0-9]*", GROUP="users", MODE="0660" | ||
107 | |||
108 | # Samsung UARTS | ||
109 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
110 | |||
111 | # MXC UARTs | ||
112 | KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" | ||
113 | |||
diff --git a/meta-oe/recipes-core/udev/udev/50-hostap_cs.rules b/meta-oe/recipes-core/udev/udev/50-hostap_cs.rules deleted file mode 100644 index efefdc58f..000000000 --- a/meta-oe/recipes-core/udev/udev/50-hostap_cs.rules +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards | ||
2 | # | ||
3 | ACTION=="add", DEVICE=="hostap_cs", \ | ||
4 | SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" | ||
diff --git a/meta-oe/recipes-core/udev/udev/akita/mount.blacklist b/meta-oe/recipes-core/udev/udev/akita/mount.blacklist deleted file mode 100644 index 7e351bc98..000000000 --- a/meta-oe/recipes-core/udev/udev/akita/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev/angstrom/mount.sh b/meta-oe/recipes-core/udev/udev/angstrom/mount.sh deleted file mode 100644 index 81bcfba5e..000000000 --- a/meta-oe/recipes-core/udev/udev/angstrom/mount.sh +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Called from udev | ||
4 | # Attemp to mount any added block devices | ||
5 | # and remove any removed devices | ||
6 | # | ||
7 | |||
8 | MOUNT="/bin/mount" | ||
9 | PMOUNT="/usr/bin/pmount" | ||
10 | UMOUNT="/bin/umount" | ||
11 | name="`basename "$DEVNAME"`" | ||
12 | |||
13 | for line in `cat /etc/udev/mount.blacklist | grep -v ^#` | ||
14 | do | ||
15 | if ( echo "$DEVNAME" | grep -q "$line" ) | ||
16 | then | ||
17 | logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" | ||
18 | exit 0 | ||
19 | fi | ||
20 | done | ||
21 | |||
22 | automount() { | ||
23 | ! test -d "/media/$name" && mkdir -p "/media/$name" | ||
24 | |||
25 | if ! $MOUNT -t auto -o async,relatime $DEVNAME "/media/$name" | ||
26 | then | ||
27 | #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" | ||
28 | rm_dir "/media/$name" | ||
29 | else | ||
30 | logger "mount.sh/automount" "Auto-mount of [/media/$name] successful" | ||
31 | touch "/tmp/.automount-$name" | ||
32 | fi | ||
33 | } | ||
34 | |||
35 | rm_dir() { | ||
36 | # We do not want to rm -r populated directories | ||
37 | if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" | ||
38 | then | ||
39 | ! test -z "$1" && rm -r "$1" | ||
40 | else | ||
41 | logger "mount.sh/automount" "Not removing non-empty directory [$1]" | ||
42 | fi | ||
43 | } | ||
44 | |||
45 | if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then | ||
46 | if [ -x "$PMOUNT" ]; then | ||
47 | $PMOUNT $DEVNAME 2> /dev/null | ||
48 | elif [ -x $MOUNT ]; then | ||
49 | $MOUNT $DEVNAME 2> /dev/null | ||
50 | fi | ||
51 | |||
52 | # If the device isn't mounted at this point, it isn't configured in fstab | ||
53 | # 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by | ||
54 | # its true device name so this would break. If the rootfs is mounted on two places | ||
55 | # during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition | ||
56 | # to /etc/udev/mount.blacklist via postinst | ||
57 | |||
58 | cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount | ||
59 | |||
60 | fi | ||
61 | |||
62 | |||
63 | |||
64 | if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then | ||
65 | for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " ` | ||
66 | do | ||
67 | $UMOUNT -l $mnt | ||
68 | done | ||
69 | |||
70 | # Remove empty directories from auto-mounter | ||
71 | test -e "/tmp/.automount-$name" && rm_dir "/media/$name" | ||
72 | fi | ||
diff --git a/meta-oe/recipes-core/udev/udev/c7x0/mount.blacklist b/meta-oe/recipes-core/udev/udev/c7x0/mount.blacklist deleted file mode 100644 index 7e351bc98..000000000 --- a/meta-oe/recipes-core/udev/udev/c7x0/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/cache b/meta-oe/recipes-core/udev/udev/cache index c0d400b44..6936170b8 100644 --- a/meta-oe/recipes-core/udev/udev-165/cache +++ b/meta-oe/recipes-core/udev/udev/cache | |||
@@ -11,11 +11,13 @@ if [ "$DEVCACHE" != "" ]; then | |||
11 | (cd /; tar cf $DEVCACHE dev) | 11 | (cd /; tar cf $DEVCACHE dev) |
12 | mv /tmp/uname /etc/udev/saved.uname | 12 | mv /tmp/uname /etc/udev/saved.uname |
13 | mv /tmp/cmdline /etc/udev/saved.cmdline | 13 | mv /tmp/cmdline /etc/udev/saved.cmdline |
14 | mv /tmp/devices /etc/udev/saved.devices | ||
14 | mv /tmp/atags /etc/udev/saved.atags | 15 | mv /tmp/atags /etc/udev/saved.atags |
15 | echo | 16 | echo |
16 | else | 17 | else |
17 | rm -f /tmp/uname | 18 | rm -f /tmp/uname |
18 | rm -f /tmp/cmdline | 19 | rm -f /tmp/cmdline |
20 | rm -f /tmp/devices | ||
19 | rm -f /tmp/atags | 21 | rm -f /tmp/atags |
20 | fi | 22 | fi |
21 | 23 | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/default b/meta-oe/recipes-core/udev/udev/default index 5c4937a9a..5c4937a9a 100644 --- a/meta-oe/recipes-core/udev/udev-165/default +++ b/meta-oe/recipes-core/udev/udev/default | |||
diff --git a/meta-oe/recipes-core/udev/udev/devfs-udev.rules b/meta-oe/recipes-core/udev/udev/devfs-udev.rules deleted file mode 100644 index 0ba1ad4e7..000000000 --- a/meta-oe/recipes-core/udev/udev/devfs-udev.rules +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | # The use of these rules is not recommended or supported. | ||
2 | # In a world where devices can come and go at any time, the devfs scheme | ||
3 | # of simple device enumeration does not help _anything_. Just forget about | ||
4 | # it. Use custom rules to name your device or look at the persistent device | ||
5 | # naming scheme, which is implemented for disks and add your subsystem. | ||
6 | |||
7 | # ide block devices | ||
8 | BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}" | ||
9 | |||
10 | # md block devices | ||
11 | KERNEL="md[0-9]*", NAME="md/%n" | ||
12 | |||
13 | # floppy devices | ||
14 | KERNEL="fd[0-9]*", NAME="floppy/%n" | ||
15 | |||
16 | # tty devices | ||
17 | KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" | ||
18 | KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" | ||
19 | KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" | ||
20 | |||
21 | # vc devices | ||
22 | KERNEL="vcs", NAME="vcc/0" | ||
23 | KERNEL="vcs[0-9]*", NAME="vcc/%n" | ||
24 | KERNEL="vcsa", NAME="vcc/a0" | ||
25 | KERNEL="vcsa[0-9]*", NAME="vcc/a%n" | ||
26 | |||
27 | # v4l devices | ||
28 | KERNEL="video[0-9]*", NAME="v4l/video%n" | ||
29 | KERNEL="radio[0-9]*", NAME="v4l/radio%n" | ||
30 | KERNEL="vbi[0-9]*", NAME="v4l/vbi%n" | ||
31 | KERNEL="vtx[0-9]*", NAME="v4l/vtx%n" | ||
32 | |||
33 | # dm devices (ignore them) | ||
34 | KERNEL="dm-[0-9]*", NAME="" | ||
35 | |||
36 | # i2c devices | ||
37 | KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k" | ||
38 | |||
39 | # loop devices | ||
40 | KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k" | ||
41 | |||
42 | # ramdisks | ||
43 | KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k" | ||
44 | |||
45 | # framebuffer devices | ||
46 | KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k" | ||
47 | |||
48 | # misc | ||
49 | KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" | ||
50 | KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" | ||
51 | KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k" | ||
52 | KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" | ||
53 | KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" | ||
54 | KERNEL="uinput", NAME="misc/%k", SYMLINK="%k" | ||
55 | |||
56 | # alsa devices | ||
57 | KERNEL="controlC[0-9]*", NAME="snd/%k" | ||
58 | KERNEL="hw[CD0-9]*", NAME="snd/%k" | ||
59 | KERNEL="pcm[CD0-9cp]*", NAME="snd/%k" | ||
60 | KERNEL="midi[CD0-9]*", NAME="snd/%k" | ||
61 | KERNEL="timer", NAME="snd/%k" | ||
62 | KERNEL="seq", NAME="snd/%k" | ||
63 | |||
64 | # oss devices | ||
65 | KERNEL="audio*", NAME="sound/%k", SYMLINK="%k" | ||
66 | KERNEL="dmmidi", NAME="sound/%k", SYMLINK="%k" | ||
67 | KERNEL="dsp*", NAME="sound/%k", SYMLINK="%k" | ||
68 | KERNEL="midi*", NAME="sound/%k", SYMLINK="%k" | ||
69 | KERNEL="mixer*", NAME="sound/%k", SYMLINK="%k" | ||
70 | KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k" | ||
71 | |||
72 | # input devices | ||
73 | KERNEL="mice", NAME="input/%k" | ||
74 | KERNEL="mouse*", NAME="input/%k" | ||
75 | KERNEL="event*", NAME="input/%k" | ||
76 | KERNEL="js*", NAME="input/%k" | ||
77 | KERNEL="ts*", NAME="input/%k" | ||
78 | |||
79 | # USB devices | ||
80 | KERNEL="hiddev*", NAME="usb/%k" | ||
81 | KERNEL="auer*", NAME="usb/%k" | ||
82 | KERNEL="legousbtower*", NAME="usb/%k" | ||
83 | KERNEL="dabusb*", NAME="usb/%k" | ||
84 | BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" | ||
85 | |||
86 | # netlink devices | ||
87 | KERNEL="route", NAME="netlink/%k" | ||
88 | KERNEL="skip", NAME="netlink/%k" | ||
89 | KERNEL="usersock", NAME="netlink/%k" | ||
90 | KERNEL="fwmonitor", NAME="netlink/%k" | ||
91 | KERNEL="tcpdiag", NAME="netlink/%k" | ||
92 | KERNEL="nflog", NAME="netlink/%k" | ||
93 | KERNEL="xfrm", NAME="netlink/%k" | ||
94 | KERNEL="arpd", NAME="netlink/%k" | ||
95 | KERNEL="route6", NAME="netlink/%k" | ||
96 | KERNEL="ip6_fw", NAME="netlink/%k" | ||
97 | KERNEL="dnrtmsg", NAME="netlink/%k" | ||
98 | KERNEL="tap*", NAME="netlink/%k" | ||
99 | |||
100 | # CAPI devices | ||
101 | KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20" | ||
102 | KERNEL="capi*", NAME="capi/%n" | ||
103 | |||
104 | # Network devices | ||
105 | KERNEL="tun", NAME="net/%k" | ||
106 | |||
107 | # raw devices | ||
108 | KERNEL="raw[0-9]*", NAME="raw/%k" | ||
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init index a13b9afcd..c0ecdfc50 100755..100644 --- a/meta-oe/recipes-core/udev/udev/init +++ b/meta-oe/recipes-core/udev/udev/init | |||
@@ -1,212 +1,75 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh -e |
2 | 2 | ||
3 | UDEVSTART=/sbin/udevstart | 3 | ### BEGIN INIT INFO |
4 | 4 | # Provides: udev | |
5 | # defaults | 5 | # Required-Start: mountvirtfs |
6 | tmpfs_size="2M" | 6 | # Required-Stop: |
7 | udev_root="/dev" | 7 | # Default-Start: S |
8 | 8 | # Default-Stop: | |
9 | [ -x $UDEVSTART ] || exit 0 | 9 | # Short-Description: Start udevd, populate /dev and load drivers. |
10 | 10 | ### END INIT INFO | |
11 | . /etc/udev/udev.conf | 11 | |
12 | 12 | export TZ=/etc/localtime | |
13 | ############################################################################## | 13 | |
14 | 14 | [ -d /sys/class ] || exit 1 | |
15 | # we need to unmount /dev/pts/ and remount it later over the tmpfs | 15 | [ -r /proc/mounts ] || exit 1 |
16 | unmount_devpts() { | 16 | [ -x /sbin/udevd ] || exit 1 |
17 | if mountpoint -q /dev/pts/; then | 17 | [ -f /etc/default/udev ] && . /etc/default/udev |
18 | umount -l /dev/pts/ | 18 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf |
19 | fi | 19 | |
20 | 20 | kill_udevd() { | |
21 | if mountpoint -q /dev/shm/; then | 21 | if [ -x /sbin/pidof ]; then |
22 | umount -l /dev/shm/ | 22 | pid=`/sbin/pidof -x udevd` |
23 | fi | 23 | [ -n "$pid" ] && kill $pid |
24 | } | 24 | fi |
25 | |||
26 | # mount a tmpfs over /dev, if somebody did not already do it | ||
27 | mount_tmpfs() { | ||
28 | if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then | ||
29 | return 0 | ||
30 | fi | ||
31 | |||
32 | # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. | ||
33 | # /etc/udev/ is recycled as a temporary mount point because it's the only | ||
34 | # directory which is guaranteed to be available. | ||
35 | mount -n -o bind /dev /etc/udev | ||
36 | |||
37 | if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then | ||
38 | umount /etc/udev | ||
39 | echo "udev requires tmpfs support, not started." | ||
40 | exit 1 | ||
41 | fi | ||
42 | |||
43 | # using ln to test if /dev works, because touch is in /usr/bin/ | ||
44 | if ln -s test /dev/test-file; then | ||
45 | rm /dev/test-file | ||
46 | else | ||
47 | echo "udev requires tmpfs support, not started." | ||
48 | umount /etc/udev | ||
49 | umount /dev | ||
50 | exit 1 | ||
51 | fi | ||
52 | |||
53 | mkdir -p /dev/.static/dev | ||
54 | chmod 700 /dev/.static/ | ||
55 | # The mount options in busybox are non-standard... | ||
56 | if test -x /bin/mount.util-linux | ||
57 | then | ||
58 | /bin/mount.util-linux --move /etc/udev /dev/.static/dev | ||
59 | elif test -x /bin/busybox | ||
60 | then | ||
61 | busybox mount -n -o move /etc/udev /dev/.static/dev | ||
62 | else | ||
63 | echo "udev requires an identifiable mount command, not started." | ||
64 | umount /etc/udev | ||
65 | umount /dev | ||
66 | exit 1 | ||
67 | fi | ||
68 | } | ||
69 | |||
70 | # I hate this hack. -- Md | ||
71 | make_extra_nodes() { | ||
72 | [ -e /etc/udev/links.conf ] || return 0 | ||
73 | grep '^[^#]' /etc/udev/links.conf | \ | ||
74 | while read type name arg1; do | ||
75 | [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue | ||
76 | case "$type" in | ||
77 | L) ln -s $arg1 /dev/$name ;; | ||
78 | D) mkdir -p /dev/$name ;; | ||
79 | M) mknod -m 600 /dev/$name $arg1 ;; | ||
80 | *) echo "links.conf: unparseable line ($type $name $arg1)" ;; | ||
81 | esac | ||
82 | done | ||
83 | } | 25 | } |
84 | 26 | ||
85 | # this function is duplicated in preinst, postinst and d-i | 27 | export ACTION=add |
86 | supported_kernel() { | 28 | # propagate /dev from /sys |
87 | case "$(uname -r)" in | 29 | echo "Starting udev" |
88 | 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; | ||
89 | 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; | ||
90 | esac | ||
91 | return 0 | ||
92 | } | ||
93 | 30 | ||
94 | # shell version of /usr/bin/tty | 31 | # mount the tmpfs on /dev, if not already done |
95 | my_tty() { | 32 | LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { |
96 | [ -x /bin/readlink ] || return 0 | 33 | mount -n -o mode=0755 -t tmpfs none "/dev" |
97 | [ -e /proc/self/fd/0 ] || return 0 | 34 | mkdir -m 0755 /dev/pts |
98 | readlink --silent /proc/self/fd/0 || true | 35 | mkdir -m 1777 /dev/shm |
99 | } | 36 | } |
100 | 37 | ||
101 | warn_if_interactive() { | 38 | if [ "$DEVCACHE" != "" ]; then |
102 | if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then | 39 | # Invalidate udev cache if the kernel or its bootargs/cmdline have changed |
103 | return 0 | 40 | [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname |
104 | fi | 41 | [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline |
105 | 42 | [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices | |
106 | TTY=$(my_tty) | 43 | [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags |
107 | if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then | 44 | if [ -e $DEVCACHE ] && \ |
108 | return 0 | 45 | cmp -s /tmp/uname /etc/udev/saved.uname && \ |
109 | fi | 46 | cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ |
110 | 47 | cmp -s /tmp/devices /etc/udev/saved.devices && \ | |
111 | printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" | 48 | cmp -s /tmp/atags /etc/udev/saved.atags; then |
112 | printf "has been run from an interactive shell.\n" | 49 | (cd /; tar xf $DEVCACHE > /dev/null 2>&1) |
113 | printf "It will probably not do what you expect, so this script will wait\n" | 50 | not_first_boot=1 |
114 | printf "60 seconds before continuing. Press ^C to stop it.\n" | 51 | fi |
115 | printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" | ||
116 | sleep 60 | ||
117 | } | ||
118 | |||
119 | ############################################################################## | ||
120 | |||
121 | if ! supported_kernel; then | ||
122 | echo "udev requires a kernel >= 2.6.12, not started." | ||
123 | exit 1 | ||
124 | fi | ||
125 | |||
126 | if [ ! -e /proc/filesystems ]; then | ||
127 | echo "udev requires a mounted procfs, not started." | ||
128 | exit 1 | ||
129 | fi | 52 | fi |
130 | 53 | ||
131 | if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then | 54 | if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then |
132 | echo "udev requires tmpfs support, not started." | 55 | mkdir -p /lib/modules/$(uname -r) |
133 | exit 1 | 56 | depmod -ae |
134 | fi | 57 | fi |
135 | 58 | ||
136 | if [ ! -d /sys/class/ ]; then | 59 | # make_extra_nodes |
137 | echo "udev requires a mounted sysfs, not started." | 60 | kill_udevd > "/dev/null" 2>&1 |
138 | exit 1 | 61 | |
139 | fi | 62 | # trigger the sorted events |
140 | 63 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | |
141 | if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then | 64 | /sbin/udevd -d |
142 | echo "udev requires hotplug support, not started." | 65 | |
143 | exit 1 | 66 | /sbin/udevadm control --env STARTUP=1 |
144 | fi | 67 | if [ "$not_first_boot" != "" ];then |
145 | 68 | /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform | |
146 | ############################################################################## | 69 | (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)& |
147 | 70 | else | |
148 | # When modifying this script, do not forget that between the time that | 71 | /sbin/udevadm trigger |
149 | # the new /dev has been mounted and udevstart has been run there will be | 72 | /sbin/udevadm settle |
150 | # no /dev/null. This also means that you cannot use the "&" shell command. | 73 | fi |
151 | |||
152 | case "$1" in | ||
153 | start) | ||
154 | if [ -e "$udev_root/.udevdb" ]; then | ||
155 | if mountpoint -q /dev/; then | ||
156 | TMPFS_MOUNTED=1 | ||
157 | else | ||
158 | echo ".udevdb already exists on the old $udev_root!" | ||
159 | fi | ||
160 | fi | ||
161 | warn_if_interactive | ||
162 | |||
163 | #echo /sbin/udevsend > /proc/sys/kernel/hotplug | ||
164 | if [ -e /sys/kernel/uevent_helper ] ; then | ||
165 | echo "" > /sys/kernel/uevent_helper | ||
166 | else | ||
167 | echo "" > /proc/sys/kernel/hotplug | ||
168 | fi | ||
169 | udevsend | ||
170 | if [ "$UDEV_DISABLED" = "yes" ]; then | ||
171 | echo "udev disabled on the kernel command line, not started." | ||
172 | exit 0 | ||
173 | fi | ||
174 | |||
175 | if [ ! "$TMPFS_MOUNTED" ]; then | ||
176 | unmount_devpts | ||
177 | mount_tmpfs | ||
178 | [ -d /proc/1 ] || mount -n /proc | ||
179 | # if this directory is not present /dev will not be updated by udev | ||
180 | mkdir /dev/.udevdb/ | ||
181 | echo "Creating initial device nodes..." | ||
182 | udevstart | ||
183 | fi | ||
184 | make_extra_nodes | ||
185 | ;; | ||
186 | stop) | ||
187 | warn_if_interactive | ||
188 | start-stop-daemon --stop --exec /sbin/udevd --quiet | ||
189 | unmount_devpts | ||
190 | if [ -d /dev/.static/dev/ ]; then | ||
191 | umount -l /dev/.static/dev/ || true | ||
192 | fi | ||
193 | echo "Unmounting /dev..." | ||
194 | # unmounting with -l should never fail | ||
195 | if ! umount -l /dev; then | ||
196 | exit 1 | ||
197 | fi | ||
198 | ;; | ||
199 | restart|force-reload) | ||
200 | start-stop-daemon --stop --exec /sbin/udevd --quiet | ||
201 | log_begin_msg "Recreating device nodes..." | ||
202 | udevstart | ||
203 | make_extra_nodes | ||
204 | log_end_msg 0 | ||
205 | ;; | ||
206 | *) | ||
207 | echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" | ||
208 | exit 1 | ||
209 | ;; | ||
210 | esac | ||
211 | 74 | ||
212 | exit 0 | 75 | exit 0 |
diff --git a/meta-oe/recipes-core/udev/udev/local.rules b/meta-oe/recipes-core/udev/udev/local.rules index 5f2efbeb0..da4b38593 100644 --- a/meta-oe/recipes-core/udev/udev/local.rules +++ b/meta-oe/recipes-core/udev/udev/local.rules | |||
@@ -20,3 +20,16 @@ SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" | |||
20 | # Handle network interface setup | 20 | # Handle network interface setup |
21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" | 21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" |
22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" | 22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" |
23 | |||
24 | # The first rtc device is symlinked to /dev/rtc | ||
25 | KERNEL=="rtc0", SYMLINK+="rtc" | ||
26 | |||
27 | #The first framebuffer is symlinked to /dev/fb | ||
28 | KERNEL=="fb0", SYMLINK+="fb" | ||
29 | |||
30 | # Try and modprobe for drivers for new hardware | ||
31 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
32 | |||
33 | # Create a symlink to any touchscreen input device | ||
34 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
35 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta-oe/recipes-core/udev/udev/mount.sh b/meta-oe/recipes-core/udev/udev/mount.sh index 440dcee57..81bcfba5e 100644 --- a/meta-oe/recipes-core/udev/udev/mount.sh +++ b/meta-oe/recipes-core/udev/udev/mount.sh | |||
@@ -22,7 +22,7 @@ done | |||
22 | automount() { | 22 | automount() { |
23 | ! test -d "/media/$name" && mkdir -p "/media/$name" | 23 | ! test -d "/media/$name" && mkdir -p "/media/$name" |
24 | 24 | ||
25 | if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name" | 25 | if ! $MOUNT -t auto -o async,relatime $DEVNAME "/media/$name" |
26 | then | 26 | then |
27 | #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" | 27 | #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" |
28 | rm_dir "/media/$name" | 28 | rm_dir "/media/$name" |
diff --git a/meta-oe/recipes-core/udev/udev/nokia900/10-cmt_speech.rules b/meta-oe/recipes-core/udev/udev/nokia900/10-cmt_speech.rules deleted file mode 100644 index 25f46efea..000000000 --- a/meta-oe/recipes-core/udev/udev/nokia900/10-cmt_speech.rules +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | KERNEL=="cmt_speech", MODE="0777" | ||
diff --git a/meta-oe/recipes-core/udev/udev/nokia900/70-persistent-net.rules b/meta-oe/recipes-core/udev/udev/nokia900/70-persistent-net.rules deleted file mode 100644 index b68f47c5f..000000000 --- a/meta-oe/recipes-core/udev/udev/nokia900/70-persistent-net.rules +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | # This file was automatically generated by the /lib/udev/write_net_rules | ||
2 | # # program, run by the persistent-net-generator.rules rules file. | ||
3 | # # | ||
4 | # # You can modify it, as long as you keep each rule on a single | ||
5 | # # line, and change only the value of the NAME= key. | ||
6 | # | ||
7 | # # net device () | ||
8 | SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1f:df:*", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="wlan*", NAME="wlan0" | ||
9 | |||
diff --git a/meta-oe/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh b/meta-oe/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh deleted file mode 100644 index c0b8251ae..000000000 --- a/meta-oe/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ $# -ne 2 ]; then | ||
4 | echo "Usage: $0 iface newmac" | ||
5 | echo " newmac is only saved if /etc/<iface>MAC is not found" | ||
6 | exit 1 | ||
7 | fi | ||
8 | |||
9 | iface="$1" | ||
10 | newmac="$2" | ||
11 | macfile=/etc/"$iface"mac | ||
12 | |||
13 | # If no MAC is found, save the one given as argument | ||
14 | if [ ! -e $macfile ]; then | ||
15 | /bin/echo "$newmac" > $macfile | ||
16 | # Otherwise load MAC from file | ||
17 | else | ||
18 | newmac=`/bin/cat $macfile` | ||
19 | fi | ||
20 | |||
21 | # Configure interface | ||
22 | /sbin/ifconfig "$iface" down | ||
23 | /sbin/ifconfig "$iface" hw ether $newmac | ||
diff --git a/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules deleted file mode 100644 index fa2ddb809..000000000 --- a/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # MAC address hack | ||
2 | # forces n900 to always use the same MAC address that is generated in the first boot | ||
3 | SUBSYSTEM=="net",KERNEL=="wlan0", RUN+="/etc/udev/scripts/nokia-n900-mac-hack.sh %k $attr{address}" | ||
4 | |||
5 | # Create inputdev symlinks for kbslider contextkit plugin | ||
6 | SUBSYSTEM=="input" ATTRS{name}=="TWL4030 Keypad" SYMLINK+="input/keypad" | ||
7 | SUBSYSTEM=="input" ATTRS{name}=="gpio-keys" SYMLINK+="input/gpio-keys" | ||
8 | |||
diff --git a/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules deleted file mode 100644 index 413c1656f..000000000 --- a/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | # ALSA devices | ||
2 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
3 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
4 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
5 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
6 | KERNEL=="timer", NAME="snd/%k" | ||
7 | KERNEL=="seq", NAME="snd/%k" | ||
8 | |||
9 | KERNEL=="snd", SUBSYSTEM=="module", ACTION=="add", \ | ||
10 | RUN+="/bin/ln -sf /proc/asound/oss/sndstat $root/sndstat" | ||
diff --git a/meta-oe/recipes-core/udev/udev/omap3-pandora/local.rules b/meta-oe/recipes-core/udev/udev/omap3-pandora/local.rules deleted file mode 100644 index 266c3ff85..000000000 --- a/meta-oe/recipes-core/udev/udev/omap3-pandora/local.rules +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # Media automounting | ||
17 | SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" | ||
18 | SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" | ||
19 | |||
20 | # Handle network interface setup | ||
21 | SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" | ||
22 | SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" | ||
23 | |||
24 | # Local UDEV rule changes for the Pandora system. | ||
25 | |||
26 | # Let all users access the event devices using EVDEV (the OpenPandora is not multiuser after all). | ||
27 | KERNEL=="event[0-9]",MODE="0666" \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev/permissions.rules b/meta-oe/recipes-core/udev/udev/permissions.rules index efbe568a2..f4f94a6db 100644 --- a/meta-oe/recipes-core/udev/udev/permissions.rules +++ b/meta-oe/recipes-core/udev/udev/permissions.rules | |||
@@ -1,79 +1,110 @@ | |||
1 | ACTION!="add", GOTO="permissions_end" | ||
2 | |||
3 | # devices needed to load the drivers providing them | ||
4 | KERNEL=="tun", OPTIONS+="ignore_remove" | ||
5 | KERNEL=="ppp", OPTIONS+="ignore_remove" | ||
6 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | ||
7 | |||
1 | # default permissions for block devices | 8 | # default permissions for block devices |
2 | SUBSYSTEM=="block", GROUP="disk" | 9 | SUBSYSTEM=="block", GROUP="disk" |
3 | SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" | 10 | # the aacraid driver is broken and reports that disks removable (see #404927) |
11 | SUBSYSTEM=="block", ATTRS{removable}=="1", \ | ||
12 | DRIVERS!="aacraid", GROUP="floppy" | ||
13 | # all block devices on these buses are "removable" | ||
14 | SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" | ||
4 | 15 | ||
5 | # IDE devices | 16 | # IDE devices |
6 | BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}="1", \ | 17 | KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ |
7 | PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom*", GROUP="cdrom" | 18 | IMPORT{program}="cdrom_id --export $tempnode" |
8 | BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" | 19 | ENV{ID_CDROM}=="?*", GROUP="cdrom" |
9 | BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" | 20 | KERNEL=="ht[0-9]*", GROUP="tape" |
21 | KERNEL=="nht[0-9]*", GROUP="tape" | ||
10 | 22 | ||
11 | # SCSI devices | 23 | # SCSI devices |
12 | BUS=="scsi", SYSFS{type}=="1", GROUP="tape" | 24 | KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" |
13 | BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" | 25 | SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" |
26 | SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" | ||
27 | SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" | ||
28 | SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" | ||
14 | 29 | ||
15 | # USB devices | 30 | # USB devices |
16 | BUS=="usb", KERNEL=="legousbtower*", MODE="0666" | 31 | KERNEL=="legousbtower*", MODE="0666" |
17 | BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" | 32 | KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" |
33 | |||
34 | # usbfs-like devices | ||
35 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ | ||
36 | MODE="0664" | ||
37 | |||
38 | # iRiver music players | ||
39 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ | ||
40 | ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" | ||
18 | 41 | ||
19 | # serial devices | 42 | # serial devices |
20 | SUBSYSTEM=="tty", GROUP="dialout" | 43 | SUBSYSTEM=="tty", GROUP="dialout" |
21 | SUBSYSTEM=="capi", GROUP="dialout" | 44 | SUBSYSTEM=="capi", GROUP="dialout" |
22 | SUBSYSTEM=="slamr", GROUP="dialout" | 45 | SUBSYSTEM=="slamr", GROUP="dialout" |
46 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
23 | 47 | ||
24 | # vc devices (all members of the tty subsystem) | 48 | # vc devices (all members of the tty subsystem) |
25 | KERNEL=="ptmx", MODE="0666", GROUP="root" | 49 | KERNEL=="ptmx", MODE="0666", GROUP="root" |
26 | KERNEL=="console", MODE="0600", GROUP="root" | 50 | KERNEL=="console", MODE="0600", GROUP="root" |
27 | KERNEL=="tty", MODE="0666", GROUP="root" | 51 | KERNEL=="tty", MODE="0666", GROUP="root" |
28 | KERNEL=="tty[0-9]*", GROUP="root" | 52 | KERNEL=="tty[0-9]*", GROUP="root" |
29 | KERNEL=="pty*", MODE="0666", GROUP="tty" | 53 | KERNEL=="pty*", MODE="0666", GROUP="tty" |
30 | 54 | ||
31 | # video devices | 55 | # video devices |
32 | SUBSYSTEM=="video4linux", GROUP="video" | 56 | SUBSYSTEM=="video4linux", GROUP="video" |
33 | SUBSYSTEM=="drm", GROUP="video" | 57 | SUBSYSTEM=="drm", GROUP="video" |
34 | SUBSYSTEM=="dvb", GROUP="video" | 58 | SUBSYSTEM=="dvb", GROUP="video" |
35 | SUBSYSTEM=="em8300", GROUP="video" | 59 | SUBSYSTEM=="em8300", GROUP="video" |
36 | SUBSYSTEM=="graphics", GROUP="video" | 60 | SUBSYSTEM=="graphics", GROUP="video" |
37 | SUBSYSTEM=="nvidia", GROUP="video" | 61 | SUBSYSTEM=="nvidia", GROUP="video" |
38 | 62 | ||
39 | # misc devices | 63 | # misc devices |
40 | KERNEL=="random", MODE="0666" | 64 | KERNEL=="random", MODE="0666" |
41 | KERNEL=="urandom", MODE="0444" | 65 | KERNEL=="urandom", MODE="0666" |
42 | KERNEL=="mem", MODE="0640", GROUP="kmem" | 66 | KERNEL=="mem", MODE="0640", GROUP="kmem" |
43 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | 67 | KERNEL=="kmem", MODE="0640", GROUP="kmem" |
44 | KERNEL=="port", MODE="0640", GROUP="kmem" | 68 | KERNEL=="port", MODE="0640", GROUP="kmem" |
45 | KERNEL=="full", MODE="0666" | 69 | KERNEL=="full", MODE="0666" |
46 | KERNEL=="null", MODE="0666" | 70 | KERNEL=="null", MODE="0666" |
47 | KERNEL=="zero", MODE="0666" | 71 | KERNEL=="zero", MODE="0666" |
48 | KERNEL=="inotify", MODE="0666" | 72 | KERNEL=="inotify", MODE="0666" |
49 | KERNEL=="sgi_fetchop", MODE="0666" | 73 | KERNEL=="sgi_fetchop", MODE="0666" |
50 | KERNEL=="sonypi", MODE="0666" | 74 | KERNEL=="sonypi", MODE="0666" |
51 | KERNEL=="agpgart", GROUP="video" | 75 | KERNEL=="agpgart", GROUP="video" |
52 | KERNEL=="rtc", MODE="0660", GROUP="audio" | 76 | KERNEL=="rtc|rtc[0-9]*", GROUP="audio" |
53 | 77 | KERNEL=="kqemu", MODE="0666" | |
54 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | 78 | KERNEL=="tun", MODE="0666", |
55 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | 79 | |
56 | KERNEL=="pktcdvd", MODE="0644" | 80 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" |
81 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
82 | KERNEL=="pktcdvd", MODE="0644" | ||
57 | 83 | ||
58 | # printers and parallel devices | 84 | # printers and parallel devices |
59 | SUBSYSTEM=="printer", GROUP="lp" | 85 | SUBSYSTEM=="printer", GROUP="lp" |
60 | SUBSYSTEM=="ppdev", GROUP="lp" | 86 | SUBSYSTEM=="ppdev", GROUP="lp" |
61 | KERNEL=="pt[0-9]*", GROUP="tape" | 87 | KERNEL=="irlpt*", GROUP="lp" |
62 | KERNEL=="pht[0-9]*", GROUP="tape" | 88 | KERNEL=="pt[0-9]*", GROUP="tape" |
89 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
63 | 90 | ||
64 | # sound devices | 91 | # sound devices |
65 | SUBSYSTEM=="sound", GROUP="audio" | 92 | SUBSYSTEM=="sound", GROUP="audio" |
66 | 93 | ||
67 | # ieee1394 devices | 94 | # ieee1394 devices |
68 | KERNEL=="raw1394", GROUP="disk" | 95 | KERNEL=="raw1394", GROUP="disk" |
69 | KERNEL=="dv1394*", GROUP="video" | 96 | KERNEL=="dv1394*", GROUP="video" |
70 | KERNEL=="video1394*", GROUP="video" | 97 | KERNEL=="video1394*", GROUP="video" |
71 | 98 | ||
72 | # input devices | 99 | # input devices |
73 | KERNEL=="event[0-9]*", MODE="0664" | 100 | KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ |
74 | KERNEL=="js[0-9]*", MODE="0664" | 101 | MODE="0664", GROUP="video" |
102 | KERNEL=="js[0-9]*", MODE="0664" | ||
103 | KERNEL=="lirc[0-9]*", GROUP="video" | ||
75 | 104 | ||
76 | # AOE character devices | 105 | # AOE character devices |
77 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | 106 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" |
78 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | 107 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" |
108 | |||
109 | LABEL="permissions_end" | ||
79 | 110 | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/run.rules b/meta-oe/recipes-core/udev/udev/run.rules index 75d71375b..75d71375b 100644 --- a/meta-oe/recipes-core/udev/udev-165/run.rules +++ b/meta-oe/recipes-core/udev/udev/run.rules | |||
diff --git a/meta-oe/recipes-core/udev/udev/shr/mount.blacklist b/meta-oe/recipes-core/udev/udev/shr/mount.blacklist deleted file mode 100644 index 117ac9b86..000000000 --- a/meta-oe/recipes-core/udev/udev/shr/mount.blacklist +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | /dev/loop | ||
2 | /dev/ram | ||
3 | /dev/mtdblock | ||
4 | /dev/mmcblk | ||
diff --git a/meta-oe/recipes-core/udev/udev/slugos/mount.blacklist b/meta-oe/recipes-core/udev/udev/slugos/mount.blacklist deleted file mode 100644 index d9da5cfd7..000000000 --- a/meta-oe/recipes-core/udev/udev/slugos/mount.blacklist +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | ram[0-9]$ | ||
2 | mtdblock[0-9]$ | ||
3 | hd[a-z]$ | ||
4 | sd[a-z]$ | ||
5 | loop[0-9]$ | ||
diff --git a/meta-oe/recipes-core/udev/udev/slugos/mount.sh b/meta-oe/recipes-core/udev/udev/slugos/mount.sh deleted file mode 100644 index b5298e97a..000000000 --- a/meta-oe/recipes-core/udev/udev/slugos/mount.sh +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Called from udev | ||
4 | # Attemp to mount any added block devices | ||
5 | # and remove any removed devices | ||
6 | # | ||
7 | |||
8 | MOUNT="/bin/mount" | ||
9 | PMOUNT="/usr/bin/pmount" | ||
10 | UMOUNT="/bin/umount" | ||
11 | name="`basename "$DEVNAME"`" | ||
12 | |||
13 | if ( blkid "$DEVNAME" | grep -q 'TYPE="mdraid"' ) | ||
14 | then | ||
15 | logger "udev/mount.sh" "[$DEVNAME] is a member of an array, ignoring" | ||
16 | exit 0 | ||
17 | fi | ||
18 | |||
19 | for line in `cat /etc/udev/mount.blacklist | grep -v ^#` | ||
20 | do | ||
21 | if ( echo "$DEVNAME" | grep -q "$line" ) | ||
22 | then | ||
23 | logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" | ||
24 | exit 0 | ||
25 | fi | ||
26 | done | ||
27 | |||
28 | automount() { | ||
29 | ! test -d "/media/$name" && mkdir -p "/media/$name" | ||
30 | |||
31 | if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name" | ||
32 | then | ||
33 | #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" | ||
34 | rm_dir "/media/$name" | ||
35 | else | ||
36 | logger "mount.sh/automount" "Auto-mount of [/media/$name] successful" | ||
37 | touch "/tmp/.automount-$name" | ||
38 | fi | ||
39 | } | ||
40 | |||
41 | rm_dir() { | ||
42 | # We do not want to rm -r populated directories | ||
43 | if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" | ||
44 | then | ||
45 | ! test -z "$1" && rm -r "$1" | ||
46 | else | ||
47 | logger "mount.sh/automount" "Not removing non-empty directory [$1]" | ||
48 | fi | ||
49 | } | ||
50 | |||
51 | if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then | ||
52 | # SlugOS: we pivot to the rootfs based on UUID, not on fstab -- so the fstab may not | ||
53 | # be correct at this point in the boot. So we must not let udev mount devices based | ||
54 | # soley on the fstab, lest we mount overtop the real rootfs. For now we just comment | ||
55 | # out the logic below and let the automount logic (far below) deal with all udev mount | ||
56 | # operations. | ||
57 | #if [ -x "$PMOUNT" ]; then | ||
58 | # $PMOUNT $DEVNAME 2> /dev/null | ||
59 | #elif [ -x $MOUNT ]; then | ||
60 | # $MOUNT $DEVNAME 2> /dev/null | ||
61 | #fi | ||
62 | |||
63 | # If the device isn't mounted at this point, it isn't configured in fstab | ||
64 | # 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by | ||
65 | # its true device name so this would break. If the rootfs is mounted on two places | ||
66 | # during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition | ||
67 | # to /etc/udev/mount.blacklist via postinst | ||
68 | |||
69 | cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount | ||
70 | |||
71 | fi | ||
72 | |||
73 | |||
74 | |||
75 | if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then | ||
76 | for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " ` | ||
77 | do | ||
78 | $UMOUNT -l $mnt | ||
79 | done | ||
80 | |||
81 | # Remove empty directories from auto-mounter | ||
82 | test -e "/tmp/.automount-$name" && rm_dir "/media/$name" | ||
83 | fi | ||
diff --git a/meta-oe/recipes-core/udev/udev/spitz/mount.blacklist b/meta-oe/recipes-core/udev/udev/spitz/mount.blacklist deleted file mode 100644 index 38c7aa4b3..000000000 --- a/meta-oe/recipes-core/udev/udev/spitz/mount.blacklist +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/hda | ||
6 | /dev/loop | ||
7 | /dev/ram \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev/tosa/mount.blacklist b/meta-oe/recipes-core/udev/udev/tosa/mount.blacklist deleted file mode 100644 index 7e351bc98..000000000 --- a/meta-oe/recipes-core/udev/udev/tosa/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/meta-oe/recipes-core/udev/udev-165/udev-replace-le16toh.patch b/meta-oe/recipes-core/udev/udev/udev-replace-le16toh.patch index 7776c9a10..7776c9a10 100644 --- a/meta-oe/recipes-core/udev/udev-165/udev-replace-le16toh.patch +++ b/meta-oe/recipes-core/udev/udev/udev-replace-le16toh.patch | |||
diff --git a/meta-oe/recipes-core/udev/udev-165/udev-replace-lutimes.patch b/meta-oe/recipes-core/udev/udev/udev-replace-lutimes.patch index dd7789734..dd7789734 100644 --- a/meta-oe/recipes-core/udev/udev-165/udev-replace-lutimes.patch +++ b/meta-oe/recipes-core/udev/udev/udev-replace-lutimes.patch | |||
diff --git a/meta-oe/recipes-core/udev/udev/udev.rules b/meta-oe/recipes-core/udev/udev/udev.rules index 5c566f6ce..c20cdcc15 100644 --- a/meta-oe/recipes-core/udev/udev/udev.rules +++ b/meta-oe/recipes-core/udev/udev/udev.rules | |||
@@ -13,33 +13,44 @@ | |||
13 | # %% the '%' char itself | 13 | # %% the '%' char itself |
14 | # | 14 | # |
15 | 15 | ||
16 | # workaround for devices which do not report media changes | ||
17 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ | ||
18 | ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions" | ||
19 | SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ | ||
20 | OPTIONS+="all_partitions" | ||
21 | |||
16 | # SCSI devices | 22 | # SCSI devices |
17 | BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" | 23 | SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" |
18 | 24 | ||
19 | # USB devices | 25 | # USB devices |
20 | BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | 26 | SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" |
21 | BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | 27 | SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" |
22 | BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | 28 | SUBSYSTEMS=="usb", KERNEL=="dabusb*", NAME="usb/%k" |
23 | BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | 29 | SUBSYSTEMS=="usb", KERNEL=="hiddev*", NAME="usb/%k" |
24 | BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | 30 | SUBSYSTEMS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" |
25 | BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | 31 | SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" |
26 | BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ | 32 | SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \ |
33 | ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \ | ||
27 | SYMLINK+="pilot" | 34 | SYMLINK+="pilot" |
28 | 35 | ||
29 | # usbfs-like devices | 36 | # usbfs-like devices |
30 | SUBSYSTEM=="usb_device", \ | 37 | SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \ |
31 | PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" | 38 | NAME="%c" |
39 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}" | ||
32 | 40 | ||
33 | # serial devices | 41 | # serial devices |
34 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | 42 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" |
35 | KERNEL=="capi[0-9]*", NAME="capi/%n" | 43 | KERNEL=="capi[0-9]*", NAME="capi/%n" |
36 | 44 | ||
37 | # video devices | 45 | # video devices |
46 | KERNEL=="dvb*", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \ | ||
47 | NAME="%c" | ||
38 | KERNEL=="card[0-9]*", NAME="dri/%k" | 48 | KERNEL=="card[0-9]*", NAME="dri/%k" |
39 | 49 | ||
40 | # misc devices | 50 | # misc devices |
41 | KERNEL=="hw_random", NAME="hwrng" | 51 | KERNEL=="hw_random", NAME="hwrng" |
42 | KERNEL=="tun", NAME="net/%k" | 52 | KERNEL=="tun", NAME="net/%k" |
53 | KERNEL=="evtchn", NAME="xen/%k" | ||
43 | 54 | ||
44 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | 55 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" |
45 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | 56 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" |
@@ -52,9 +63,8 @@ KERNEL=="microcode", NAME="cpu/microcode" | |||
52 | KERNEL=="umad*", NAME="infiniband/%k" | 63 | KERNEL=="umad*", NAME="infiniband/%k" |
53 | KERNEL=="issm*", NAME="infiniband/%k" | 64 | KERNEL=="issm*", NAME="infiniband/%k" |
54 | KERNEL=="uverbs*", NAME="infiniband/%k" | 65 | KERNEL=="uverbs*", NAME="infiniband/%k" |
55 | KERNEL=="ucm", NAME="infiniband/%k" | 66 | KERNEL=="ucm*", NAME="infiniband/%k" |
56 | 67 | KERNEL=="rdma_ucm", NAME="infiniband/%k" | |
57 | KERNEL=="buzzer", NAME="misc/buzzer" | ||
58 | 68 | ||
59 | # ALSA devices | 69 | # ALSA devices |
60 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | 70 | KERNEL=="controlC[0-9]*", NAME="snd/%k" |
@@ -87,12 +97,17 @@ KERNEL=="zap[0-9]*", NAME="zap/%n" | |||
87 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | 97 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" |
88 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | 98 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" |
89 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | 99 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" |
100 | SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k" | ||
90 | 101 | ||
91 | # device mapper creates its own device nodes, so ignore these | 102 | # device mapper creates its own device nodes, so ignore these |
92 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | 103 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" |
93 | KERNEL=="device-mapper", NAME="mapper/control" | 104 | KERNEL=="device-mapper", NAME="mapper/control" |
94 | 105 | ||
95 | KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" | 106 | KERNEL=="rfcomm[0-9]*", GROUP="users", MODE="0660" |
107 | |||
108 | # Samsung UARTS | ||
109 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
110 | |||
111 | # MXC UARTs | ||
112 | KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" | ||
96 | 113 | ||
97 | # Firmware Helper | ||
98 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/sbin/firmware_helper" | ||
diff --git a/meta-oe/recipes-core/udev/udev_165.bb b/meta-oe/recipes-core/udev/udev_168.bb index e8e6dddab..4e34c0ddc 100644 --- a/meta-oe/recipes-core/udev/udev_165.bb +++ b/meta-oe/recipes-core/udev/udev_168.bb | |||
@@ -1,6 +1,9 @@ | |||
1 | DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ | 1 | DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ |
2 | /dev/, handles hotplug events and loads drivers at boot time. It replaces \ | 2 | /dev/, handles hotplug events and loads drivers at boot time. It replaces \ |
3 | the hotplug package and requires a kernel not older than 2.6.12." | 3 | the hotplug package and requires a kernel not older than 2.6.27." |
4 | |||
5 | # udev 169 will bump kernel requirements up to 2.6.36 for ARM: | ||
6 | # http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f | ||
4 | 7 | ||
5 | LICENSE = "GPLv2+ & LGPLv2.1+" | 8 | LICENSE = "GPLv2+ & LGPLv2.1+" |
6 | LICENSE_${PN} = "GPLv2+" | 9 | LICENSE_${PN} = "GPLv2+" |
@@ -10,29 +13,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
10 | file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 13 | file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ |
11 | file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 14 | file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
12 | 15 | ||
13 | PR = "r2" | ||
14 | |||
15 | # Untested | ||
16 | DEFAULT_PREFERENCE = "-1" | ||
17 | |||
18 | # Needed for udev-extras | 16 | # Needed for udev-extras |
19 | DEPENDS = "gperf-native usbutils acl glib-2.0" | 17 | DEPENDS = "gperf-native usbutils acl glib-2.0" |
20 | RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" | ||
21 | |||
22 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
23 | file://mount.blacklist \ | ||
24 | file://run.rules \ | ||
25 | " | ||
26 | 18 | ||
27 | SRC_URI[md5sum] = "b8cf77be693fd09ccfcf26d3e4e23e97" | 19 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz" |
28 | SRC_URI[sha256sum] = "5c271f43d8a28176050abbc6b4e4354203b6a7d810c72c18afefd1ee100485c3" | 20 | SRC_URI[md5sum] = "08eb7c2564bc89defcefdaa6ec4a9fc1" |
21 | SRC_URI[sha256sum] = "1d5c548d7c85d30b3508b82ad88d853e28dddb6c526d0e67aa92ac18af93d218" | ||
29 | 22 | ||
30 | SRC_URI += " \ | 23 | SRC_URI += " \ |
24 | file://run.rules \ | ||
31 | file://udev.rules \ | 25 | file://udev.rules \ |
32 | file://devfs-udev.rules \ | ||
33 | file://links.conf \ | 26 | file://links.conf \ |
34 | file://permissions.rules \ | 27 | file://permissions.rules \ |
35 | file://mount.sh \ | 28 | file://mount.sh \ |
29 | file://mount.blacklist \ | ||
36 | file://network.sh \ | 30 | file://network.sh \ |
37 | file://local.rules \ | 31 | file://local.rules \ |
38 | file://default \ | 32 | file://default \ |
@@ -41,25 +35,6 @@ SRC_URI += " \ | |||
41 | file://udev-compat-wrapper-patch \ | 35 | file://udev-compat-wrapper-patch \ |
42 | " | 36 | " |
43 | 37 | ||
44 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
45 | PACKAGE_ARCH_h2200 = "h2200" | ||
46 | |||
47 | #buglabs's bug device | ||
48 | SRC_URI_append_bug = " \ | ||
49 | file://30-BUG.rules \ | ||
50 | file://10-mx31.rules \ | ||
51 | file://bmi_eventpipe.sh " | ||
52 | |||
53 | SRC_URI_append_nokia900 = " \ | ||
54 | file://10-cmt_speech.rules \ | ||
55 | file://70-persistent-net.rules \ | ||
56 | file://udev-rules-nokia-n900-hacks.rules \ | ||
57 | file://udev-rules-nokia-n900-snd.rules \ | ||
58 | file://nokia-n900-mac-hack.sh \ | ||
59 | " | ||
60 | |||
61 | PACKAGE_ARCH_bug = "bug" | ||
62 | |||
63 | inherit update-rc.d autotools | 38 | inherit update-rc.d autotools |
64 | 39 | ||
65 | EXTRA_OECONF += " --with-udev-prefix= \ | 40 | EXTRA_OECONF += " --with-udev-prefix= \ |
@@ -75,7 +50,7 @@ EXTRA_OECONF += " --with-udev-prefix= \ | |||
75 | " | 50 | " |
76 | 51 | ||
77 | INITSCRIPT_NAME = "udev" | 52 | INITSCRIPT_NAME = "udev" |
78 | INITSCRIPT_PARAMS = "start 03 S ." | 53 | INITSCRIPT_PARAMS = "start 04 S ." |
79 | 54 | ||
80 | PACKAGES =+ "libudev libgudev udev-utils" | 55 | PACKAGES =+ "libudev libgudev udev-utils" |
81 | 56 | ||
@@ -87,12 +62,16 @@ FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevad | |||
87 | RPROVIDES_${PN} = "hotplug" | 62 | RPROVIDES_${PN} = "hotplug" |
88 | FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" | 63 | FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" |
89 | FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" | 64 | FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" |
65 | RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" | ||
90 | 66 | ||
91 | # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} | 67 | # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} |
92 | # is ${prefix}/lib64 | 68 | # is ${prefix}/lib64 |
93 | FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" | 69 | FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" |
94 | FILES_${PN}-dbg += "/lib/udev/.debug" | 70 | FILES_${PN}-dbg += "/lib/udev/.debug" |
95 | 71 | ||
72 | # Package up systemd files | ||
73 | FILES_${PN} += "${base_libdir}/systemd" | ||
74 | |||
96 | do_install () { | 75 | do_install () { |
97 | install -d ${D}${usrsbindir} \ | 76 | install -d ${D}${usrsbindir} \ |
98 | ${D}${sbindir} | 77 | ${D}${sbindir} |
@@ -112,12 +91,10 @@ do_install () { | |||
112 | install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules | 91 | install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules |
113 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | 92 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules |
114 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | 93 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf |
115 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
116 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
117 | fi | ||
118 | 94 | ||
119 | touch ${D}${sysconfdir}/udev/saved.uname | 95 | touch ${D}${sysconfdir}/udev/saved.uname |
120 | touch ${D}${sysconfdir}/udev/saved.cmdline | 96 | touch ${D}${sysconfdir}/udev/saved.cmdline |
97 | touch ${D}${sysconfdir}/udev/saved.devices | ||
121 | touch ${D}${sysconfdir}/udev/saved.atags | 98 | touch ${D}${sysconfdir}/udev/saved.atags |
122 | 99 | ||
123 | install -d ${D}${sysconfdir}/udev/scripts/ | 100 | install -d ${D}${sysconfdir}/udev/scripts/ |
@@ -126,24 +103,6 @@ do_install () { | |||
126 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 103 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts |
127 | } | 104 | } |
128 | 105 | ||
129 | do_install_append_h2200() { | ||
130 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
131 | } | ||
132 | |||
133 | do_install_append_bug() { | ||
134 | install -m 0644 ${WORKDIR}/30-BUG.rules ${D}${sysconfdir}/udev/rules.d/30-BUG.rules | ||
135 | install -m 0644 ${WORKDIR}/10-mx31.rules ${D}${sysconfdir}/udev/rules.d/10-mx31.rules | ||
136 | install -m 0644 ${WORKDIR}/bmi_eventpipe.sh ${D}${sysconfdir}/udev/scripts/bmi_eventpipe.sh | ||
137 | } | ||
138 | |||
139 | do_install_append_nokia900() { | ||
140 | install -m 0644 ${WORKDIR}/10-cmt_speech.rules ${D}${sysconfdir}/udev/rules.d/10-cmt_speech.rules | ||
141 | install -m 0644 ${WORKDIR}/70-persistent-net.rules ${D}${sysconfdir}/udev/rules.d/70-persistent-net.rules | ||
142 | install -m 0644 ${WORKDIR}/udev-rules-nokia-n900-hacks.rules ${D}${sysconfdir}/udev/rules.d/udev-rules-nokia-n900-hacks.rules | ||
143 | install -m 0644 ${WORKDIR}/udev-rules-nokia-n900-snd.rules ${D}${sysconfdir}/udev/rules.d/udev-rules-nokia-n900-snd.rules | ||
144 | install -m 0755 ${WORKDIR}/nokia-n900-mac-hack.sh ${D}${sysconfdir}/udev/scripts/nokia-n900-mac-hack.sh | ||
145 | } | ||
146 | |||
147 | # Create the cache after checkroot has run | 106 | # Create the cache after checkroot has run |
148 | pkg_postinst_udev_append() { | 107 | pkg_postinst_udev_append() { |
149 | if test "x$D" != "x"; then | 108 | if test "x$D" != "x"; then |
@@ -151,5 +110,5 @@ pkg_postinst_udev_append() { | |||
151 | else | 110 | else |
152 | OPT="-s" | 111 | OPT="-s" |
153 | fi | 112 | fi |
154 | update-rc.d $OPT udev-cache start 12 S . | 113 | update-rc.d $OPT udev-cache start 36 S . |
155 | } | 114 | } |