diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-20 13:00:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:27 +0000 |
commit | f4e60ec827d574efdd74663c4904a7da51304fcc (patch) | |
tree | 43959cb13d4b1a13734dad04f79921316e8e8c19 /meta/recipes-core/udev/udev-145 | |
parent | a99a63959b2e91519a26ff6305729b1072e638fa (diff) | |
download | poky-f4e60ec827d574efdd74663c4904a7da51304fcc.tar.gz |
udev: drop 145 version
The 164 version has been the default version for some time and as we
don't have any clear reasoning to keep 145 around, we're removing it
now.
Some files were also removed as 164 recipe provides specific versions
of it and thus those were going to be unused.
(From OE-Core rev: 7376f027c39716561b513a70f6e7f86fb14df178)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev/udev-145')
-rw-r--r-- | meta/recipes-core/udev/udev-145/enable-gudev.patch | 50 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/init | 59 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/local.rules | 33 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/noasmlinkage.patch | 50 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/permissions.rules | 131 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/run.rules | 14 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/udev.rules | 116 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-145/unbreak.patch | 26 |
8 files changed, 0 insertions, 479 deletions
diff --git a/meta/recipes-core/udev/udev-145/enable-gudev.patch b/meta/recipes-core/udev/udev-145/enable-gudev.patch deleted file mode 100644 index 8ee402b134..0000000000 --- a/meta/recipes-core/udev/udev-145/enable-gudev.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: udev-145/configure.ac | ||
4 | =================================================================== | ||
5 | --- udev-145.orig/configure.ac 2010-01-29 14:41:29.000000000 +0000 | ||
6 | +++ udev-145/configure.ac 2010-01-29 14:41:54.000000000 +0000 | ||
7 | @@ -49,16 +49,17 @@ | ||
8 | AC_ARG_ENABLE([extras], | ||
9 | AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]), | ||
10 | [], [enable_extras=yes]) | ||
11 | + | ||
12 | + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0]) | ||
13 | + AC_SUBST([GLIB_CFLAGS]) | ||
14 | + AC_SUBST([GLIB_LIBS]) | ||
15 | + | ||
16 | if test "x$enable_extras" = xyes; then | ||
17 | AC_PATH_PROG([GPERF], [gperf]) | ||
18 | if test -z "$GPERF"; then | ||
19 | AC_MSG_ERROR([gperf is needed]) | ||
20 | fi | ||
21 | |||
22 | - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0]) | ||
23 | - AC_SUBST([GLIB_CFLAGS]) | ||
24 | - AC_SUBST([GLIB_LIBS]) | ||
25 | - | ||
26 | AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found])) | ||
27 | AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found])) | ||
28 | |||
29 | Index: udev-145/extras/Makefile.am | ||
30 | =================================================================== | ||
31 | --- udev-145.orig/extras/Makefile.am 2010-01-29 14:43:56.000000000 +0000 | ||
32 | +++ udev-145/extras/Makefile.am 2010-01-29 14:44:11.000000000 +0000 | ||
33 | @@ -12,7 +12,8 @@ | ||
34 | rule_generator \ | ||
35 | scsi_id \ | ||
36 | usb_id \ | ||
37 | - v4l_id | ||
38 | + v4l_id \ | ||
39 | + gudev | ||
40 | |||
41 | if ENABLE_EXTRAS | ||
42 | SUBDIRS += \ | ||
43 | @@ -20,6 +21,5 @@ | ||
44 | usb-db \ | ||
45 | hid2hci \ | ||
46 | keymap \ | ||
47 | - modem-modeswitch \ | ||
48 | - gudev | ||
49 | + modem-modeswitch | ||
50 | endif | ||
diff --git a/meta/recipes-core/udev/udev-145/init b/meta/recipes-core/udev/udev-145/init deleted file mode 100644 index eb5e50758b..0000000000 --- a/meta/recipes-core/udev/udev-145/init +++ /dev/null | |||
@@ -1,59 +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/udev/udev.conf ] && . /etc/udev/udev.conf | ||
18 | |||
19 | kill_udevd() { | ||
20 | if [ -x /sbin/pidof ]; then | ||
21 | pid=`/sbin/pidof -x udevd` | ||
22 | [ -n "$pid" ] && kill $pid | ||
23 | fi | ||
24 | } | ||
25 | |||
26 | export ACTION=add | ||
27 | # propagate /dev from /sys | ||
28 | echo -n "Starting udev" | ||
29 | |||
30 | # mount the tmpfs on /dev, if not already done | ||
31 | LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { | ||
32 | mount -n -o mode=0755 -t tmpfs none "/dev" | ||
33 | mkdir -m 0755 /dev/pts | ||
34 | mkdir -m 1777 /dev/shm | ||
35 | } | ||
36 | |||
37 | if [ -e /etc/dev.tar ]; then | ||
38 | (cd /; tar xf /etc/dev.tar) | ||
39 | not_first_boot=1 | ||
40 | fi | ||
41 | |||
42 | # make_extra_nodes | ||
43 | kill_udevd > "/dev/null" 2>&1 | ||
44 | |||
45 | # trigger the sorted events | ||
46 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | ||
47 | /sbin/udevd -d | ||
48 | |||
49 | /sbin/udevadm control --env=STARTUP=1 | ||
50 | if [ "$not_first_boot" != "" ];then | ||
51 | /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 | ||
52 | (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& | ||
53 | else | ||
54 | /sbin/udevadm trigger | ||
55 | /sbin/udevadm settle | ||
56 | fi | ||
57 | |||
58 | echo | ||
59 | exit 0 | ||
diff --git a/meta/recipes-core/udev/udev-145/local.rules b/meta/recipes-core/udev/udev-145/local.rules deleted file mode 100644 index dab319b431..0000000000 --- a/meta/recipes-core/udev/udev-145/local.rules +++ /dev/null | |||
@@ -1,33 +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 | # Try and modprobe for drivers for new hardware | ||
28 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
29 | |||
30 | # Create a symlink to any touchscreen input device | ||
31 | # Need to use ../ so the eventX can find the parent inputX modalias which is a directory above | ||
32 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
33 | |||
diff --git a/meta/recipes-core/udev/udev-145/noasmlinkage.patch b/meta/recipes-core/udev/udev-145/noasmlinkage.patch deleted file mode 100644 index 6d22b1d681..0000000000 --- a/meta/recipes-core/udev/udev-145/noasmlinkage.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [legacy version] | ||
2 | |||
3 | Index: udev-141/udev/test-udev.c | ||
4 | =================================================================== | ||
5 | --- udev-141.orig/udev/test-udev.c 2008-10-24 09:07:24.000000000 +0100 | ||
6 | +++ udev-141/udev/test-udev.c 2009-04-14 15:34:01.000000000 +0100 | ||
7 | @@ -30,7 +30,7 @@ | ||
8 | |||
9 | #include "udev.h" | ||
10 | |||
11 | -static void asmlinkage sig_handler(int signum) | ||
12 | +static void sig_handler(int signum) | ||
13 | { | ||
14 | switch (signum) { | ||
15 | case SIGALRM: | ||
16 | Index: udev-141/udev/udevadm-monitor.c | ||
17 | =================================================================== | ||
18 | --- udev-141.orig/udev/udevadm-monitor.c 2009-03-29 19:07:01.000000000 +0100 | ||
19 | +++ udev-141/udev/udevadm-monitor.c 2009-04-14 15:34:01.000000000 +0100 | ||
20 | @@ -35,7 +35,7 @@ | ||
21 | |||
22 | static int udev_exit; | ||
23 | |||
24 | -static void asmlinkage sig_handler(int signum) | ||
25 | +static void sig_handler(int signum) | ||
26 | { | ||
27 | if (signum == SIGINT || signum == SIGTERM) | ||
28 | udev_exit = 1; | ||
29 | Index: udev-141/udev/udevd.c | ||
30 | =================================================================== | ||
31 | --- udev-141.orig/udev/udevd.c 2009-03-29 19:07:01.000000000 +0100 | ||
32 | +++ udev-141/udev/udevd.c 2009-04-14 15:34:56.000000000 +0100 | ||
33 | @@ -172,7 +172,7 @@ | ||
34 | udev_event_unref(event); | ||
35 | } | ||
36 | |||
37 | -static void asmlinkage event_sig_handler(int signum) | ||
38 | +static void event_sig_handler(int signum) | ||
39 | { | ||
40 | if (signum == SIGALRM) | ||
41 | exit(1); | ||
42 | @@ -583,7 +583,7 @@ | ||
43 | return 0; | ||
44 | } | ||
45 | |||
46 | -static void asmlinkage sig_handler(int signum) | ||
47 | +static void sig_handler(int signum) | ||
48 | { | ||
49 | switch (signum) { | ||
50 | case SIGINT: | ||
diff --git a/meta/recipes-core/udev/udev-145/permissions.rules b/meta/recipes-core/udev/udev-145/permissions.rules deleted file mode 100644 index 205b733292..0000000000 --- a/meta/recipes-core/udev/udev-145/permissions.rules +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | ACTION!="add", GOTO="permissions_end" | ||
2 | |||
3 | # workarounds needed to synchronize with sysfs | ||
4 | # only needed for kernels < v2.6.18-rc1 | ||
5 | ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" | ||
6 | SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", WAIT_FOR_SYSFS="ioerr_cnt" | ||
7 | # only needed for kernels < 2.6.16 | ||
8 | SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | ||
9 | # only needed for kernels < 2.6.17 | ||
10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | ||
11 | |||
12 | # devices needed to load the drivers providing them | ||
13 | KERNEL=="tun", OPTIONS+="ignore_remove" | ||
14 | KERNEL=="ppp", OPTIONS+="ignore_remove" | ||
15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | ||
16 | |||
17 | # default permissions for block devices | ||
18 | SUBSYSTEM=="block", GROUP="disk" | ||
19 | # the aacraid driver is broken and reports that disks removable (see #404927) | ||
20 | SUBSYSTEM=="block", ATTRS{removable}=="1", \ | ||
21 | DRIVERS!="aacraid", GROUP="floppy" | ||
22 | # all block devices on these buses are "removable" | ||
23 | SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy" | ||
24 | |||
25 | # IDE devices | ||
26 | KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ | ||
27 | IMPORT{program}="cdrom_id --export $tempnode" | ||
28 | ENV{ID_CDROM}=="?*", GROUP="cdrom" | ||
29 | KERNEL=="ht[0-9]*", GROUP="tape" | ||
30 | KERNEL=="nht[0-9]*", GROUP="tape" | ||
31 | |||
32 | # SCSI devices | ||
33 | KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" | ||
34 | SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" | ||
35 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP", GROUP="scanner" | ||
36 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" | ||
37 | SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" | ||
38 | SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" | ||
39 | SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" | ||
40 | SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" | ||
41 | SUBSYSTEMS=="scsi", ATTRS{type}=="8", GROUP="tape" | ||
42 | |||
43 | # USB devices | ||
44 | KERNEL=="legousbtower*", MODE="0666" | ||
45 | KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb", GROUP="lp" | ||
46 | |||
47 | # usbfs-like devices | ||
48 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \ | ||
49 | MODE="0664" | ||
50 | |||
51 | # iRiver music players | ||
52 | SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="plugdev", \ | ||
53 | ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]" | ||
54 | |||
55 | # serial devices | ||
56 | SUBSYSTEM=="tty", GROUP="dialout" | ||
57 | SUBSYSTEM=="capi", GROUP="dialout" | ||
58 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
59 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
60 | |||
61 | # vc devices (all members of the tty subsystem) | ||
62 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
63 | KERNEL=="console", MODE="0600", GROUP="root" | ||
64 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
65 | KERNEL=="tty[0-9]*", GROUP="root" | ||
66 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
67 | |||
68 | # video devices | ||
69 | SUBSYSTEM=="video4linux", GROUP="video" | ||
70 | SUBSYSTEM=="drm", GROUP="video" | ||
71 | SUBSYSTEM=="dvb", GROUP="video" | ||
72 | SUBSYSTEM=="em8300", GROUP="video" | ||
73 | SUBSYSTEM=="graphics", GROUP="video" | ||
74 | SUBSYSTEM=="nvidia", GROUP="video" | ||
75 | |||
76 | # misc devices | ||
77 | KERNEL=="random", MODE="0666" | ||
78 | KERNEL=="urandom", MODE="0666" | ||
79 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
80 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
81 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
82 | KERNEL=="full", MODE="0666" | ||
83 | KERNEL=="null", MODE="0666" | ||
84 | KERNEL=="zero", MODE="0666" | ||
85 | KERNEL=="inotify", MODE="0666" | ||
86 | KERNEL=="sgi_fetchop", MODE="0666" | ||
87 | KERNEL=="sonypi", MODE="0666" | ||
88 | KERNEL=="agpgart", GROUP="video" | ||
89 | KERNEL=="nvram", GROUP="nvram" | ||
90 | KERNEL=="rtc|rtc[0-9]*", GROUP="audio" | ||
91 | KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" | ||
92 | KERNEL=="fuse", GROUP="fuse" | ||
93 | KERNEL=="kqemu", MODE="0666" | ||
94 | KERNEL=="kvm", GROUP="kvm" | ||
95 | KERNEL=="tun", MODE="0666", | ||
96 | |||
97 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
98 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
99 | KERNEL=="pktcdvd", MODE="0644" | ||
100 | |||
101 | KERNEL=="uverbs*", GROUP="rdma" | ||
102 | KERNEL=="ucm*", GROUP="rdma" | ||
103 | KERNEL=="rdma_ucm", GROUP="rdma" | ||
104 | |||
105 | # printers and parallel devices | ||
106 | SUBSYSTEM=="printer", GROUP="lp" | ||
107 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
108 | KERNEL=="irlpt*", GROUP="lp" | ||
109 | KERNEL=="pt[0-9]*", GROUP="tape" | ||
110 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
111 | |||
112 | # sound devices | ||
113 | SUBSYSTEM=="sound", GROUP="audio" | ||
114 | |||
115 | # ieee1394 devices | ||
116 | KERNEL=="raw1394", GROUP="disk" | ||
117 | KERNEL=="dv1394*", GROUP="video" | ||
118 | KERNEL=="video1394*", GROUP="video" | ||
119 | |||
120 | # input devices | ||
121 | KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \ | ||
122 | MODE="0664", GROUP="video" | ||
123 | KERNEL=="js[0-9]*", MODE="0664" | ||
124 | KERNEL=="lirc[0-9]*", GROUP="video" | ||
125 | |||
126 | # AOE character devices | ||
127 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
128 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
129 | |||
130 | LABEL="permissions_end" | ||
131 | |||
diff --git a/meta/recipes-core/udev/udev-145/run.rules b/meta/recipes-core/udev/udev-145/run.rules deleted file mode 100644 index 75d71375bb..0000000000 --- a/meta/recipes-core/udev/udev-145/run.rules +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # debugging monitor | ||
2 | RUN+="socket:/org/kernel/udev/monitor" | ||
3 | |||
4 | # run a command on remove events | ||
5 | ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" | ||
6 | |||
7 | # ignore the events generated by virtual consoles | ||
8 | KERNEL=="ptmx", OPTIONS+="last_rule" | ||
9 | KERNEL=="console", OPTIONS+="last_rule" | ||
10 | KERNEL=="tty" , OPTIONS+="last_rule" | ||
11 | KERNEL=="tty[0-9]*", OPTIONS+="last_rule" | ||
12 | KERNEL=="pty*", OPTIONS+="last_rule" | ||
13 | SUBSYSTEM=="vc", OPTIONS+="last_rule" | ||
14 | |||
diff --git a/meta/recipes-core/udev/udev-145/udev.rules b/meta/recipes-core/udev/udev-145/udev.rules deleted file mode 100644 index a19d4a0bf6..0000000000 --- a/meta/recipes-core/udev/udev-145/udev.rules +++ /dev/null | |||
@@ -1,116 +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*", NAME="%k", 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]*", NAME="%k", GROUP="users", MODE="0660" | ||
107 | |||
108 | # Firmware Helper | ||
109 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh" | ||
110 | |||
111 | # Samsung UARTS | ||
112 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
113 | |||
114 | # MXC UARTs | ||
115 | KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" | ||
116 | |||
diff --git a/meta/recipes-core/udev/udev-145/unbreak.patch b/meta/recipes-core/udev/udev-145/unbreak.patch deleted file mode 100644 index ef45c093e2..0000000000 --- a/meta/recipes-core/udev/udev-145/unbreak.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [legacy version] | ||
2 | |||
3 | Index: udev-141/extras/volume_id/lib/Makefile.am | ||
4 | =================================================================== | ||
5 | --- udev-141.orig/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:16.000000000 +0100 | ||
6 | +++ udev-141/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:26.000000000 +0100 | ||
7 | @@ -54,19 +54,6 @@ | ||
8 | -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ | ||
9 | -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols | ||
10 | |||
11 | -# move devel files to $(prefix)$(libdir_name) if needed | ||
12 | -install-data-hook: | ||
13 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.la | ||
14 | - if test "$(prefix)" != "$(exec_prefix)"; then \ | ||
15 | - mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ | ||
16 | - mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \ | ||
17 | - so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \ | ||
18 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ | ||
19 | - so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ | ||
20 | - ln -sf $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \ | ||
21 | - $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ | ||
22 | - fi | ||
23 | - | ||
24 | EXTRA_DIST = \ | ||
25 | exported_symbols | ||
26 | |||