diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-07 12:09:51 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-07 12:10:26 +0100 |
commit | 1c24729697a75a7bac325e26b9c1102aa6b08a3d (patch) | |
tree | f3b2c95e11e167ed3e32c0ab668d005cbd529265 /meta/recipes-core | |
parent | 85cf6f3e97e8ec4cc34c8994c59f993b18556fb6 (diff) | |
download | poky-1c24729697a75a7bac325e26b9c1102aa6b08a3d.tar.gz |
udev: Drop old versions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
35 files changed, 0 insertions, 2302 deletions
diff --git a/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch deleted file mode 100644 index 4bd0d4d9b9..0000000000 --- a/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Index: udev-092/udev_libc_wrapper.h | ||
2 | =================================================================== | ||
3 | --- udev-092.orig/udev_libc_wrapper.h 2006-07-26 21:55:06.000000000 +0100 | ||
4 | +++ udev-092/udev_libc_wrapper.h 2006-07-26 21:55:37.000000000 +0100 | ||
5 | @@ -58,9 +58,9 @@ | ||
6 | # define __NR_inotify_add_watch 152 | ||
7 | # define __NR_inotify_rm_watch 156 | ||
8 | #elif defined (__arm__) | ||
9 | -# define __NR_inotify_init 316 | ||
10 | -# define __NR_inotify_add_watch 317 | ||
11 | -# define __NR_inotify_rm_watch 318 | ||
12 | +# define __NR_inotify_init __NR_SYSCALL_BASE+316 | ||
13 | +# define __NR_inotify_add_watch __NR_SYSCALL_BASE+317 | ||
14 | +# define __NR_inotify_rm_watch __NR_SYSCALL_BASE+318 | ||
15 | #elif defined (__sh__) | ||
16 | # define __NR_inotify_init 290 | ||
17 | # define __NR_inotify_add_watch 291 | ||
diff --git a/meta/recipes-core/udev/udev-092/flags.patch b/meta/recipes-core/udev/udev-092/flags.patch deleted file mode 100644 index 492a39881c..0000000000 --- a/meta/recipes-core/udev/udev-092/flags.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | --- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 | ||
2 | +++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 | ||
3 | @@ -117,28 +117,28 @@ | ||
4 | AR = $(CROSS_COMPILE)ar | ||
5 | RANLIB = $(CROSS_COMPILE)ranlib | ||
6 | |||
7 | -CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
8 | +override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
9 | WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ | ||
10 | -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ | ||
11 | -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes | ||
12 | -CFLAGS += $(WARNINGS) | ||
13 | +override CFLAGS += $(WARNINGS) | ||
14 | |||
15 | LDFLAGS = -Wl,-warn-common | ||
16 | |||
17 | OPTFLAGS = -Os | ||
18 | -CFLAGS += $(OPTFLAGS) | ||
19 | +override CFLAGS += $(OPTFLAGS) | ||
20 | |||
21 | ifeq ($(strip $(USE_LOG)),true) | ||
22 | - CFLAGS += -DUSE_LOG | ||
23 | + override CFLAGS += -DUSE_LOG | ||
24 | endif | ||
25 | |||
26 | # if DEBUG is enabled, then we do not strip | ||
27 | ifeq ($(strip $(DEBUG)),true) | ||
28 | - CFLAGS += -DDEBUG | ||
29 | + override CFLAGS += -DDEBUG | ||
30 | endif | ||
31 | |||
32 | ifeq ($(strip $(USE_GCOV)),true) | ||
33 | - CFLAGS += -fprofile-arcs -ftest-coverage | ||
34 | + override CFLAGS += -fprofile-arcs -ftest-coverage | ||
35 | LDFLAGS += -fprofile-arcs | ||
36 | endif | ||
37 | |||
38 | @@ -151,11 +151,11 @@ | ||
39 | ifeq ($(strip $(USE_SELINUX)),true) | ||
40 | UDEV_OBJS += udev_selinux.o | ||
41 | LIB_OBJS += -lselinux -lsepol | ||
42 | - CFLAGS += -DUSE_SELINUX | ||
43 | + override CFLAGS += -DUSE_SELINUX | ||
44 | endif | ||
45 | |||
46 | ifeq ($(strip $(USE_STATIC)),true) | ||
47 | - CFLAGS += -DUSE_STATIC | ||
48 | + override CFLAGS += -DUSE_STATIC | ||
49 | LDFLAGS += -static | ||
50 | endif | ||
51 | |||
diff --git a/meta/recipes-core/udev/udev-092/init b/meta/recipes-core/udev/udev-092/init deleted file mode 100644 index 5a60d52a9a..0000000000 --- a/meta/recipes-core/udev/udev-092/init +++ /dev/null | |||
@@ -1,227 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: udev | ||
4 | # Required-Start: mountvirtfs | ||
5 | # Required-Stop: | ||
6 | # Default-Start: S | ||
7 | # Default-Stop: | ||
8 | # Short-Description: Start udevd, populate /dev and load drivers. | ||
9 | ### END INIT INFO | ||
10 | |||
11 | # we need to unmount /dev/pts/ and remount it later over the tmpfs | ||
12 | unmount_devpts() { | ||
13 | if mountpoint -q /dev/pts/; then | ||
14 | umount -l /dev/pts/ | ||
15 | fi | ||
16 | |||
17 | if mountpoint -q /dev/shm/; then | ||
18 | umount -l /dev/shm/ | ||
19 | fi | ||
20 | } | ||
21 | |||
22 | # mount a tmpfs over /dev, if somebody did not already do it | ||
23 | mount_tmpfs() { | ||
24 | if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then | ||
25 | return | ||
26 | fi | ||
27 | |||
28 | # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. | ||
29 | # /etc/udev/ is recycled as a temporary mount point because it's the only | ||
30 | # directory which is guaranteed to be available. | ||
31 | mount -n -o bind /dev /etc/udev | ||
32 | |||
33 | if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then | ||
34 | umount /etc/udev | ||
35 | echo "udev requires tmpfs support, not started." | ||
36 | exit 1 | ||
37 | fi | ||
38 | |||
39 | mkdir -p /dev/.static/dev | ||
40 | chmod 700 /dev/.static/ | ||
41 | # The mount options in busybox are non-standard... | ||
42 | if test -x /bin/mount.util-linux | ||
43 | then | ||
44 | /bin/mount.util-linux --move /etc/udev /dev/.static/dev | ||
45 | elif test -x /bin/busybox | ||
46 | then | ||
47 | busybox mount -n -o move /etc/udev /dev/.static/dev | ||
48 | else | ||
49 | echo "udev requires an identifiable mount command, not started." | ||
50 | umount /etc/udev | ||
51 | umount /dev | ||
52 | exit 1 | ||
53 | fi | ||
54 | } | ||
55 | |||
56 | # I hate this hack. -- Md | ||
57 | make_extra_nodes() { | ||
58 | if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then | ||
59 | cp -a /lib/udev/devices/* /dev/ | ||
60 | fi | ||
61 | |||
62 | [ -e /etc/udev/links.conf ] || return 0 | ||
63 | grep '^[^#]' /etc/udev/links.conf | \ | ||
64 | while read type name arg1; do | ||
65 | [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue | ||
66 | case "$type" in | ||
67 | L) ln -s $arg1 /dev/$name ;; | ||
68 | D) mkdir -p /dev/$name ;; | ||
69 | M) mknod -m 600 /dev/$name $arg1 ;; | ||
70 | *) echo "links.conf: unparseable line ($type $name $arg1)" ;; | ||
71 | esac | ||
72 | done | ||
73 | } | ||
74 | |||
75 | supported_kernel() { | ||
76 | case "$(uname -r)" in | ||
77 | 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; | ||
78 | 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; | ||
79 | esac | ||
80 | return 0 | ||
81 | } | ||
82 | |||
83 | set_hotplug_handler() { | ||
84 | case "$(uname -r)" in | ||
85 | 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; | ||
86 | esac | ||
87 | echo $HANDLER > /proc/sys/kernel/hotplug | ||
88 | } | ||
89 | |||
90 | # shell version of /usr/bin/tty | ||
91 | my_tty() { | ||
92 | [ -x /bin/readlink ] || return 0 | ||
93 | [ -e /proc/self/fd/0 ] || return 0 | ||
94 | readlink --silent /proc/self/fd/0 || true | ||
95 | } | ||
96 | |||
97 | warn_if_interactive() { | ||
98 | if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then | ||
99 | return | ||
100 | fi | ||
101 | |||
102 | TTY=$(my_tty) | ||
103 | if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then | ||
104 | return | ||
105 | fi | ||
106 | |||
107 | printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" | ||
108 | printf "has been run from an interactive shell.\n" | ||
109 | printf "It will probably not do what you expect, so this script will wait\n" | ||
110 | printf "60 seconds before continuing. Press ^C to stop it.\n" | ||
111 | printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" | ||
112 | sleep 60 | ||
113 | } | ||
114 | |||
115 | ############################################################################## | ||
116 | |||
117 | PATH="/sbin:/bin:/usr/bin" | ||
118 | |||
119 | [ -x /sbin/udevd ] || exit 0 | ||
120 | |||
121 | # defaults | ||
122 | tmpfs_size="10M" | ||
123 | udev_root="/dev" | ||
124 | udevd_timeout=30 | ||
125 | |||
126 | . /etc/udev/udev.conf | ||
127 | |||
128 | if ! supported_kernel; then | ||
129 | echo "udev requires a kernel >= 2.6.12, not started." | ||
130 | exit 1 | ||
131 | fi | ||
132 | |||
133 | if [ ! -e /proc/filesystems ]; then | ||
134 | echo "udev requires a mounted procfs, not started." | ||
135 | exit 1 | ||
136 | fi | ||
137 | |||
138 | if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then | ||
139 | echo "udev requires tmpfs support, not started." | ||
140 | exit 1 | ||
141 | fi | ||
142 | |||
143 | if [ ! -d /sys/class/ ]; then | ||
144 | echo "udev requires a mounted sysfs, not started." | ||
145 | exit 1 | ||
146 | fi | ||
147 | |||
148 | if [ ! -e /proc/sys/kernel/hotplug ]; then | ||
149 | echo "udev requires hotplug support, not started." | ||
150 | exit 1 | ||
151 | fi | ||
152 | |||
153 | ############################################################################## | ||
154 | |||
155 | # When modifying this script, do not forget that between the time that | ||
156 | # the new /dev has been mounted and udevsynthesize has been run there will be | ||
157 | # no /dev/null. This also means that you cannot use the "&" shell command. | ||
158 | |||
159 | case "$1" in | ||
160 | start) | ||
161 | if [ -e "$udev_root/.udev/" ]; then | ||
162 | if mountpoint -q /dev/; then | ||
163 | TMPFS_MOUNTED=1 | ||
164 | else | ||
165 | echo ".udev/ already exists on the static $udev_root!" | ||
166 | fi | ||
167 | else | ||
168 | warn_if_interactive | ||
169 | fi | ||
170 | |||
171 | echo "Starting the hotplug events dispatcher" "udevd" | ||
172 | udevd --daemon | ||
173 | |||
174 | set_hotplug_handler | ||
175 | |||
176 | if [ -z "$TMPFS_MOUNTED" ]; then | ||
177 | unmount_devpts | ||
178 | mount_tmpfs | ||
179 | [ -d /proc/1 ] || mount -n /proc | ||
180 | fi | ||
181 | |||
182 | # if this directory is not present /dev will not be updated by udev | ||
183 | mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/ | ||
184 | # /dev/null must be created before udevd is started | ||
185 | make_extra_nodes | ||
186 | |||
187 | echo "Synthesizing the initial hotplug events" | ||
188 | udevsynthesize | ||
189 | |||
190 | # wait for the udevd childs to finish | ||
191 | echo "Waiting for /dev to be fully populated" | ||
192 | while [ -d /dev/.udev/queue/ ]; do | ||
193 | sleep 1 | ||
194 | udevd_timeout=$(($udevd_timeout - 1)) | ||
195 | if [ $udevd_timeout -eq 0 ]; then | ||
196 | # ps axf | ||
197 | break | ||
198 | fi | ||
199 | done | ||
200 | if [ $udevd_timeout -eq 0 ]; then | ||
201 | echo 'timeout' | ||
202 | fi | ||
203 | ;; | ||
204 | |||
205 | stop) | ||
206 | echo "Stopping the hotplug events dispatcher" "udevd" | ||
207 | start-stop-daemon --stop --name udevd --quiet | ||
208 | ;; | ||
209 | |||
210 | restart|force-reload) | ||
211 | echo "Stopping the hotplug events dispatcher" "udevd" | ||
212 | if start-stop-daemon --stop --name udevd --quiet ; then | ||
213 | exit 1 | ||
214 | fi | ||
215 | |||
216 | echo "Starting the hotplug events dispatcher" "udevd" | ||
217 | udevd --daemon | ||
218 | ;; | ||
219 | |||
220 | *) | ||
221 | echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" | ||
222 | exit 1 | ||
223 | ;; | ||
224 | esac | ||
225 | |||
226 | exit 0 | ||
227 | |||
diff --git a/meta/recipes-core/udev/udev-092/local.rules b/meta/recipes-core/udev/udev-092/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-092/local.rules +++ /dev/null | |||
@@ -1,31 +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 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta/recipes-core/udev/udev-092/permissions.rules b/meta/recipes-core/udev/udev-092/permissions.rules deleted file mode 100644 index 8da35c3090..0000000000 --- a/meta/recipes-core/udev/udev-092/permissions.rules +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | ACTION!="add", GOTO="permissions_end" | ||
2 | |||
3 | # workarounds needed to synchronize with sysfs | ||
4 | DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" | ||
5 | SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" | ||
6 | # only needed for kernels < 2.6.16 | ||
7 | SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | ||
8 | # only needed for kernels < 2.6.17 | ||
9 | SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | ||
10 | |||
11 | # default permissions for block devices | ||
12 | SUBSYSTEM=="block", GROUP="disk" | ||
13 | SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" | ||
14 | |||
15 | # IDE devices | ||
16 | BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ | ||
17 | IMPORT{program}="cdrom_id --export $tempnode" | ||
18 | ENV{ID_CDROM}=="?*", GROUP="cdrom" | ||
19 | BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" | ||
20 | BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" | ||
21 | |||
22 | # SCSI devices | ||
23 | BUS=="scsi", SYSFS{type}=="1", GROUP="tape" | ||
24 | BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" | ||
25 | BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" | ||
26 | BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" | ||
27 | |||
28 | # USB devices | ||
29 | BUS=="usb", KERNEL=="legousbtower*", MODE="0666" | ||
30 | BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" | ||
31 | |||
32 | # usbfs-like devices | ||
33 | SUBSYSTEM=="usb_device", MODE="0664" | ||
34 | |||
35 | # iRiver music players | ||
36 | SUBSYSTEM=="usb_device", GROUP="plugdev", \ | ||
37 | SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" | ||
38 | |||
39 | # serial devices | ||
40 | SUBSYSTEM=="tty", GROUP="dialout" | ||
41 | SUBSYSTEM=="capi", GROUP="dialout" | ||
42 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
43 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
44 | |||
45 | # vc devices (all members of the tty subsystem) | ||
46 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
47 | KERNEL=="console", MODE="0600", GROUP="root" | ||
48 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
49 | KERNEL=="tty[0-9]*", GROUP="root" | ||
50 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
51 | |||
52 | # video devices | ||
53 | SUBSYSTEM=="video4linux", GROUP="video" | ||
54 | SUBSYSTEM=="drm", GROUP="video" | ||
55 | SUBSYSTEM=="dvb", GROUP="video" | ||
56 | SUBSYSTEM=="em8300", GROUP="video" | ||
57 | SUBSYSTEM=="graphics", GROUP="video" | ||
58 | SUBSYSTEM=="nvidia", GROUP="video" | ||
59 | |||
60 | # misc devices | ||
61 | KERNEL=="random", MODE="0666" | ||
62 | KERNEL=="urandom", MODE="0666" | ||
63 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
64 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
65 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
66 | KERNEL=="full", MODE="0666" | ||
67 | KERNEL=="null", MODE="0666" | ||
68 | KERNEL=="zero", MODE="0666" | ||
69 | KERNEL=="inotify", MODE="0666" | ||
70 | KERNEL=="sgi_fetchop", MODE="0666" | ||
71 | KERNEL=="sonypi", MODE="0666" | ||
72 | KERNEL=="agpgart", GROUP="video" | ||
73 | KERNEL=="nvram", GROUP="nvram" | ||
74 | KERNEL=="rtc", GROUP="audio" | ||
75 | KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" | ||
76 | KERNEL=="fuse", GROUP="fuse" | ||
77 | |||
78 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
79 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
80 | KERNEL=="pktcdvd", MODE="0644" | ||
81 | |||
82 | KERNEL=="uverbs*", GROUP="rdma" | ||
83 | KERNEL=="ucm*", GROUP="rdma" | ||
84 | |||
85 | # printers and parallel devices | ||
86 | SUBSYSTEM=="printer", GROUP="lp" | ||
87 | SUBSYSTEM=="ppdev", 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]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ | ||
101 | MODE="0664", GROUP="video" | ||
102 | KERNEL=="js[0-9]*", MODE="0664" | ||
103 | |||
104 | # AOE character devices | ||
105 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
106 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
107 | |||
108 | LABEL="permissions_end" | ||
109 | |||
diff --git a/meta/recipes-core/udev/udev-092/udev.rules b/meta/recipes-core/udev/udev-092/udev.rules deleted file mode 100644 index 72be706e84..0000000000 --- a/meta/recipes-core/udev/udev-092/udev.rules +++ /dev/null | |||
@@ -1,102 +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 | # SCSI devices | ||
17 | BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" | ||
18 | |||
19 | # USB devices | ||
20 | BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
21 | BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
22 | BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | ||
23 | BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | ||
24 | BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | ||
25 | BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | ||
26 | BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ | ||
27 | SYMLINK+="pilot" | ||
28 | |||
29 | # usbfs-like devices | ||
30 | SUBSYSTEM=="usb_device", \ | ||
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" | ||
32 | |||
33 | # serial devices | ||
34 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | ||
35 | KERNEL=="capi[0-9]*", NAME="capi/%n" | ||
36 | |||
37 | # video devices | ||
38 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
39 | |||
40 | # misc devices | ||
41 | KERNEL=="hw_random", NAME="hwrng" | ||
42 | KERNEL=="tun", NAME="net/%k" | ||
43 | |||
44 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | ||
45 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | ||
46 | KERNEL=="pktcdvd", NAME="pktcdvd/control" | ||
47 | |||
48 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" | ||
49 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
50 | KERNEL=="microcode", NAME="cpu/microcode" | ||
51 | |||
52 | KERNEL=="umad*", NAME="infiniband/%k" | ||
53 | KERNEL=="issm*", NAME="infiniband/%k" | ||
54 | KERNEL=="uverbs*", NAME="infiniband/%k" | ||
55 | KERNEL=="ucm", NAME="infiniband/%k" | ||
56 | |||
57 | KERNEL=="buzzer", NAME="misc/buzzer" | ||
58 | |||
59 | # ALSA devices | ||
60 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
61 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
62 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
63 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
64 | KERNEL=="timer", NAME="snd/%k" | ||
65 | KERNEL=="seq", NAME="snd/%k" | ||
66 | |||
67 | # ieee1394 devices | ||
68 | KERNEL=="dv1394*", NAME="dv1394/%n" | ||
69 | KERNEL=="video1394*", NAME="video1394/%n" | ||
70 | |||
71 | # input devices | ||
72 | KERNEL=="mice", NAME="input/%k" | ||
73 | KERNEL=="mouse[0-9]*", NAME="input/%k" | ||
74 | KERNEL=="event[0-9]*", NAME="input/%k" | ||
75 | KERNEL=="js[0-9]*", NAME="input/%k" | ||
76 | KERNEL=="ts[0-9]*", NAME="input/%k" | ||
77 | KERNEL=="uinput", NAME="input/%k" | ||
78 | |||
79 | # Zaptel | ||
80 | KERNEL=="zapctl", NAME="zap/ctl" | ||
81 | KERNEL=="zaptimer", NAME="zap/timer" | ||
82 | KERNEL=="zapchannel", NAME="zap/channel" | ||
83 | KERNEL=="zappseudo", NAME="zap/pseudo" | ||
84 | KERNEL=="zap[0-9]*", NAME="zap/%n" | ||
85 | |||
86 | # AOE character devices | ||
87 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | ||
88 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | ||
89 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | ||
90 | |||
91 | # device mapper creates its own device nodes, so ignore these | ||
92 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | ||
93 | KERNEL=="device-mapper", NAME="mapper/control" | ||
94 | |||
95 | KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" | ||
96 | |||
97 | # Firmware Helper | ||
98 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" | ||
99 | |||
100 | # Samsung UARTS | ||
101 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
102 | |||
diff --git a/meta/recipes-core/udev/udev-115/flags.patch b/meta/recipes-core/udev/udev-115/flags.patch deleted file mode 100644 index 13f20eb6a8..0000000000 --- a/meta/recipes-core/udev/udev-115/flags.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | --- | ||
2 | Makefile | 16 ++++++++-------- | ||
3 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
4 | |||
5 | Index: udev-115/Makefile | ||
6 | =================================================================== | ||
7 | --- udev-115.orig/Makefile 2007-08-24 01:29:54.000000000 +0200 | ||
8 | +++ udev-115/Makefile 2007-09-20 17:21:45.000000000 +0200 | ||
9 | @@ -112,39 +112,39 @@ | ||
10 | AR = $(CROSS_COMPILE)ar | ||
11 | RANLIB = $(CROSS_COMPILE)ranlib | ||
12 | |||
13 | -CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
14 | +override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
15 | WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ | ||
16 | -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ | ||
17 | -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes | ||
18 | -CFLAGS += $(WARNINGS) | ||
19 | +override CFLAGS += $(WARNINGS) | ||
20 | |||
21 | LDFLAGS += -Wl,-warn-common,--as-needed | ||
22 | |||
23 | OPTFLAGS = -Os | ||
24 | -CFLAGS += $(OPTFLAGS) | ||
25 | +override CFLAGS += $(OPTFLAGS) | ||
26 | |||
27 | ifeq ($(strip $(USE_LOG)),true) | ||
28 | - CFLAGS += -DUSE_LOG | ||
29 | + override CFLAGS += -DUSE_LOG | ||
30 | endif | ||
31 | |||
32 | # if DEBUG is enabled, then we do not strip | ||
33 | ifeq ($(strip $(DEBUG)),true) | ||
34 | - CFLAGS += -DDEBUG | ||
35 | + override CFLAGS += -DDEBUG | ||
36 | endif | ||
37 | |||
38 | ifeq ($(strip $(USE_GCOV)),true) | ||
39 | - CFLAGS += -fprofile-arcs -ftest-coverage | ||
40 | + override CFLAGS += -fprofile-arcs -ftest-coverage | ||
41 | LDFLAGS += -fprofile-arcs | ||
42 | endif | ||
43 | |||
44 | ifeq ($(strip $(USE_SELINUX)),true) | ||
45 | UDEV_OBJS += udev_selinux.o | ||
46 | LIB_OBJS += -lselinux -lsepol | ||
47 | - CFLAGS += -DUSE_SELINUX | ||
48 | + override CFLAGS += -DUSE_SELINUX | ||
49 | endif | ||
50 | |||
51 | ifeq ($(strip $(USE_STATIC)),true) | ||
52 | - CFLAGS += -DUSE_STATIC | ||
53 | + override CFLAGS += -DUSE_STATIC | ||
54 | LDFLAGS += -static | ||
55 | endif | ||
56 | |||
diff --git a/meta/recipes-core/udev/udev-115/init b/meta/recipes-core/udev/udev-115/init deleted file mode 100644 index c882c75607..0000000000 --- a/meta/recipes-core/udev/udev-115/init +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | export TZ=/etc/localtime | ||
2 | |||
3 | [ -d /sys/class ] || exit 1 | ||
4 | [ -r /proc/mounts ] || exit 1 | ||
5 | [ -x /sbin/udevd ] || exit 1 | ||
6 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf | ||
7 | |||
8 | kill_udevd() { | ||
9 | if [ -x /sbin/pidof ]; then | ||
10 | pid=`/sbin/pidof -x udevd` | ||
11 | [ -n "$pid" ] && kill $pid | ||
12 | fi | ||
13 | } | ||
14 | |||
15 | export ACTION=add | ||
16 | # propagate /dev from /sys | ||
17 | echo -n "Starting udev" | ||
18 | |||
19 | # mount the tmpfs on /dev, if not already done | ||
20 | LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { | ||
21 | mount -n -o mode=0755 -t tmpfs none "/dev" | ||
22 | mkdir -m 0755 /dev/pts | ||
23 | mkdir -m 0755 /dev/shm | ||
24 | } | ||
25 | |||
26 | if [ -e /etc/dev.tar ]; then | ||
27 | (cd /; tar xf /etc/dev.tar) | ||
28 | not_first_boot=1 | ||
29 | fi | ||
30 | |||
31 | # make_extra_nodes | ||
32 | kill_udevd > "/dev/null" 2>&1 | ||
33 | |||
34 | # trigger the sorted events | ||
35 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | ||
36 | /sbin/udevd -d | ||
37 | |||
38 | /sbin/udevcontrol env STARTUP=1 | ||
39 | if [ "$not_first_boot" != "" ];then | ||
40 | /sbin/udevtrigger --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 | ||
41 | (/sbin/udevsettle --timeout=3; /sbin/udevcontrol env STARTUP=)& | ||
42 | else | ||
43 | /sbin/udevtrigger | ||
44 | /sbin/udevsettle | ||
45 | fi | ||
46 | |||
47 | echo | ||
48 | exit 0 | ||
diff --git a/meta/recipes-core/udev/udev-115/local.rules b/meta/recipes-core/udev/udev-115/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-115/local.rules +++ /dev/null | |||
@@ -1,31 +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 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta/recipes-core/udev/udev-115/noasmlinkage.patch b/meta/recipes-core/udev/udev-115/noasmlinkage.patch deleted file mode 100644 index 5824d29590..0000000000 --- a/meta/recipes-core/udev/udev-115/noasmlinkage.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- | ||
7 | udevd.c | 2 +- | ||
8 | udevstart.c | 2 +- | ||
9 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | Index: udev-115/udevd.c | ||
12 | =================================================================== | ||
13 | --- udev-115.orig/udevd.c 2007-08-24 01:29:54.000000000 +0200 | ||
14 | +++ udev-115/udevd.c 2007-09-20 17:04:51.000000000 +0200 | ||
15 | @@ -767,7 +767,7 @@ | ||
16 | return msg; | ||
17 | } | ||
18 | |||
19 | -static void asmlinkage sig_handler(int signum) | ||
20 | +static void sig_handler(int signum) | ||
21 | { | ||
22 | switch (signum) { | ||
23 | case SIGINT: | ||
24 | Index: udev-115/udevstart.c | ||
25 | =================================================================== | ||
26 | --- udev-115.orig/udevstart.c 2007-08-24 01:29:54.000000000 +0200 | ||
27 | +++ udev-115/udevstart.c 2007-09-20 17:04:51.000000000 +0200 | ||
28 | @@ -304,7 +304,7 @@ | ||
29 | } | ||
30 | } | ||
31 | |||
32 | -static void asmlinkage sig_handler(int signum) | ||
33 | +static void sig_handler(int signum) | ||
34 | { | ||
35 | switch (signum) { | ||
36 | case SIGALRM: | ||
diff --git a/meta/recipes-core/udev/udev-115/permissions.rules b/meta/recipes-core/udev/udev-115/permissions.rules deleted file mode 100644 index 99e03b1036..0000000000 --- a/meta/recipes-core/udev/udev-115/permissions.rules +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | ACTION!="add", GOTO="permissions_end" | ||
2 | |||
3 | # workarounds needed to synchronize with sysfs | ||
4 | DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" | ||
5 | SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" | ||
6 | # only needed for kernels < 2.6.16 | ||
7 | SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | ||
8 | # only needed for kernels < 2.6.17 | ||
9 | SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | ||
10 | |||
11 | # default permissions for block devices | ||
12 | SUBSYSTEM=="block", GROUP="disk" | ||
13 | SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" | ||
14 | |||
15 | # IDE devices | ||
16 | BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ | ||
17 | IMPORT{program}="cdrom_id --export $tempnode" | ||
18 | ENV{ID_CDROM}=="?*", GROUP="cdrom" | ||
19 | BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" | ||
20 | BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" | ||
21 | |||
22 | # SCSI devices | ||
23 | BUS=="scsi", SYSFS{type}=="1", GROUP="tape" | ||
24 | BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" | ||
25 | |||
26 | # USB devices | ||
27 | BUS=="usb", KERNEL=="legousbtower*", MODE="0666" | ||
28 | BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" | ||
29 | |||
30 | # usbfs-like devices | ||
31 | SUBSYSTEM=="usb_device", MODE="0664" | ||
32 | |||
33 | # iRiver music players | ||
34 | SUBSYSTEM=="usb_device", GROUP="plugdev", \ | ||
35 | SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" | ||
36 | |||
37 | # serial devices | ||
38 | SUBSYSTEM=="tty", GROUP="dialout" | ||
39 | SUBSYSTEM=="capi", GROUP="dialout" | ||
40 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
41 | SUBSYSTEM=="zaptel", GROUP="dialout" | ||
42 | |||
43 | # vc devices (all members of the tty subsystem) | ||
44 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
45 | KERNEL=="console", MODE="0600", GROUP="root" | ||
46 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
47 | KERNEL=="tty[0-9]*", GROUP="root" | ||
48 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
49 | |||
50 | # video devices | ||
51 | SUBSYSTEM=="video4linux", GROUP="video" | ||
52 | SUBSYSTEM=="drm", GROUP="video" | ||
53 | SUBSYSTEM=="dvb", GROUP="video" | ||
54 | SUBSYSTEM=="em8300", GROUP="video" | ||
55 | SUBSYSTEM=="graphics", GROUP="video" | ||
56 | SUBSYSTEM=="nvidia", GROUP="video" | ||
57 | |||
58 | # misc devices | ||
59 | KERNEL=="random", MODE="0666" | ||
60 | KERNEL=="urandom", MODE="0666" | ||
61 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
62 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
63 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
64 | KERNEL=="full", MODE="0666" | ||
65 | KERNEL=="null", MODE="0666" | ||
66 | KERNEL=="zero", MODE="0666" | ||
67 | KERNEL=="inotify", MODE="0666" | ||
68 | KERNEL=="sgi_fetchop", MODE="0666" | ||
69 | KERNEL=="sonypi", MODE="0666" | ||
70 | KERNEL=="agpgart", GROUP="video" | ||
71 | KERNEL=="rtc", GROUP="audio" | ||
72 | |||
73 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
74 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
75 | KERNEL=="pktcdvd", MODE="0644" | ||
76 | |||
77 | # printers and parallel devices | ||
78 | SUBSYSTEM=="printer", GROUP="lp" | ||
79 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
80 | KERNEL=="pt[0-9]*", GROUP="tape" | ||
81 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
82 | |||
83 | # sound devices | ||
84 | SUBSYSTEM=="sound", GROUP="audio" | ||
85 | |||
86 | # ieee1394 devices | ||
87 | KERNEL=="raw1394", GROUP="disk" | ||
88 | KERNEL=="dv1394*", GROUP="video" | ||
89 | KERNEL=="video1394*", GROUP="video" | ||
90 | |||
91 | # input devices | ||
92 | KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ | ||
93 | MODE="0664", GROUP="video" | ||
94 | KERNEL=="js[0-9]*", MODE="0664" | ||
95 | |||
96 | # AOE character devices | ||
97 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
98 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
99 | |||
100 | LABEL="permissions_end" | ||
101 | |||
diff --git a/meta/recipes-core/udev/udev-115/udev.rules b/meta/recipes-core/udev/udev-115/udev.rules deleted file mode 100644 index 4d29acac0c..0000000000 --- a/meta/recipes-core/udev/udev-115/udev.rules +++ /dev/null | |||
@@ -1,105 +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 | # SCSI devices | ||
17 | BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" | ||
18 | |||
19 | # USB devices | ||
20 | BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
21 | BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
22 | BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | ||
23 | BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | ||
24 | BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | ||
25 | BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | ||
26 | BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ | ||
27 | SYMLINK+="pilot" | ||
28 | |||
29 | # usbfs-like devices | ||
30 | SUBSYSTEM=="usb_device", \ | ||
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" | ||
32 | |||
33 | # serial devices | ||
34 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | ||
35 | KERNEL=="capi[0-9]*", NAME="capi/%n" | ||
36 | |||
37 | # video devices | ||
38 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
39 | |||
40 | # misc devices | ||
41 | KERNEL=="hw_random", NAME="hwrng" | ||
42 | KERNEL=="tun", NAME="net/%k" | ||
43 | |||
44 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | ||
45 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | ||
46 | KERNEL=="pktcdvd", NAME="pktcdvd/control" | ||
47 | |||
48 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" | ||
49 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
50 | KERNEL=="microcode", NAME="cpu/microcode" | ||
51 | |||
52 | KERNEL=="umad*", NAME="infiniband/%k" | ||
53 | KERNEL=="issm*", NAME="infiniband/%k" | ||
54 | KERNEL=="uverbs*", NAME="infiniband/%k" | ||
55 | KERNEL=="ucm", NAME="infiniband/%k" | ||
56 | |||
57 | KERNEL=="buzzer", NAME="misc/buzzer" | ||
58 | |||
59 | # ALSA devices | ||
60 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
61 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
62 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
63 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
64 | KERNEL=="timer", NAME="snd/%k" | ||
65 | KERNEL=="seq", NAME="snd/%k" | ||
66 | |||
67 | # ieee1394 devices | ||
68 | KERNEL=="dv1394*", NAME="dv1394/%n" | ||
69 | KERNEL=="video1394*", NAME="video1394/%n" | ||
70 | |||
71 | # input devices | ||
72 | KERNEL=="mice", NAME="input/%k" | ||
73 | KERNEL=="mouse[0-9]*", NAME="input/%k" | ||
74 | KERNEL=="event[0-9]*", NAME="input/%k" | ||
75 | KERNEL=="js[0-9]*", NAME="input/%k" | ||
76 | KERNEL=="ts[0-9]*", NAME="input/%k" | ||
77 | KERNEL=="uinput", NAME="input/%k" | ||
78 | |||
79 | # Zaptel | ||
80 | KERNEL=="zapctl", NAME="zap/ctl" | ||
81 | KERNEL=="zaptimer", NAME="zap/timer" | ||
82 | KERNEL=="zapchannel", NAME="zap/channel" | ||
83 | KERNEL=="zappseudo", NAME="zap/pseudo" | ||
84 | KERNEL=="zap[0-9]*", NAME="zap/%n" | ||
85 | |||
86 | # AOE character devices | ||
87 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | ||
88 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | ||
89 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | ||
90 | |||
91 | # device mapper creates its own device nodes, so ignore these | ||
92 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | ||
93 | KERNEL=="device-mapper", NAME="mapper/control" | ||
94 | |||
95 | KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" | ||
96 | |||
97 | # Firmware Helper | ||
98 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" | ||
99 | |||
100 | # Samsung UARTS | ||
101 | KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" | ||
102 | |||
103 | # MXC UARTs | ||
104 | KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" | ||
105 | |||
diff --git a/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch deleted file mode 100644 index 87cafcaa9d..0000000000 --- a/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | --- | ||
2 | udevtrigger.c | 40 ++++++++++++++++++++++++++++++++++++++++ | ||
3 | 1 file changed, 40 insertions(+) | ||
4 | |||
5 | Index: udev-115/udevtrigger.c | ||
6 | =================================================================== | ||
7 | --- udev-115.orig/udevtrigger.c 2007-08-24 01:29:54.000000000 +0200 | ||
8 | +++ udev-115/udevtrigger.c 2007-09-21 18:45:28.000000000 +0200 | ||
9 | @@ -39,6 +39,8 @@ | ||
10 | LIST_HEAD(device_list); | ||
11 | LIST_HEAD(filter_subsystem_match_list); | ||
12 | LIST_HEAD(filter_subsystem_nomatch_list); | ||
13 | +LIST_HEAD(filter_kernel_match_list); | ||
14 | +LIST_HEAD(filter_kernel_nomatch_list); | ||
15 | LIST_HEAD(filter_attr_match_list); | ||
16 | LIST_HEAD(filter_attr_nomatch_list); | ||
17 | |||
18 | @@ -218,6 +220,26 @@ | ||
19 | return 0; | ||
20 | } | ||
21 | |||
22 | +static int kernel_filtered(const char *kernel) | ||
23 | +{ | ||
24 | + struct name_entry *loop_name; | ||
25 | + | ||
26 | + /* skip devices matching the prohibited kernel device names */ | ||
27 | + list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node) | ||
28 | + if (fnmatch(loop_name->name, kernel, 0) == 0) | ||
29 | + return 1; | ||
30 | + | ||
31 | + /* skip devices not matching the listed kernel device names */ | ||
32 | + if (!list_empty(&filter_kernel_match_list)) { | ||
33 | + list_for_each_entry(loop_name, &filter_kernel_match_list, node) | ||
34 | + if (fnmatch(loop_name->name, kernel, 0) == 0) | ||
35 | + return 0; | ||
36 | + return 1; | ||
37 | + } | ||
38 | + | ||
39 | + return 0; | ||
40 | +} | ||
41 | + | ||
42 | static int attr_filtered(const char *path) | ||
43 | { | ||
44 | struct name_entry *loop_name; | ||
45 | @@ -296,6 +318,9 @@ | ||
46 | if (dent2->d_name[0] == '.') | ||
47 | continue; | ||
48 | |||
49 | + if (kernel_filtered(dent2->d_name)) | ||
50 | + continue; | ||
51 | + | ||
52 | strlcpy(dirname2, dirname, sizeof(dirname2)); | ||
53 | strlcat(dirname2, "/", sizeof(dirname2)); | ||
54 | strlcat(dirname2, dent2->d_name, sizeof(dirname2)); | ||
55 | @@ -402,6 +427,9 @@ | ||
56 | if (!strcmp(dent2->d_name, "device")) | ||
57 | continue; | ||
58 | |||
59 | + if (kernel_filtered(dent2->d_name)) | ||
60 | + continue; | ||
61 | + | ||
62 | strlcpy(dirname2, dirname, sizeof(dirname2)); | ||
63 | strlcat(dirname2, "/", sizeof(dirname2)); | ||
64 | strlcat(dirname2, dent2->d_name, sizeof(dirname2)); | ||
65 | @@ -458,6 +486,8 @@ | ||
66 | { "subsystem-nomatch", 1, NULL, 'S' }, | ||
67 | { "attr-match", 1, NULL, 'a' }, | ||
68 | { "attr-nomatch", 1, NULL, 'A' }, | ||
69 | + { "kernel-match", 1, NULL, 'k' }, | ||
70 | + { "kernel-nomatch", 1, NULL, 'K' }, | ||
71 | {} | ||
72 | }; | ||
73 | |||
74 | @@ -496,6 +526,12 @@ | ||
75 | case 'A': | ||
76 | name_list_add(&filter_attr_nomatch_list, optarg, 0); | ||
77 | break; | ||
78 | + case 'k': | ||
79 | + name_list_add(&filter_kernel_match_list, optarg, 0); | ||
80 | + break; | ||
81 | + case 'K': | ||
82 | + name_list_add(&filter_kernel_nomatch_list, optarg, 0); | ||
83 | + break; | ||
84 | case 'h': | ||
85 | printf("Usage: udevtrigger OPTIONS\n" | ||
86 | " --verbose print the list of devices while running\n" | ||
87 | @@ -504,6 +540,8 @@ | ||
88 | " marked as failed during a previous run\n" | ||
89 | " --subsystem-match=<subsystem> trigger devices from a matching subystem\n" | ||
90 | " --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n" | ||
91 | + " --kernel-match=<subsystem> trigger devices from a matching kernel device name\n" | ||
92 | + " --kernel-nomatch=<subsystem> exclude devices from a matching kernel device name\n" | ||
93 | " --attr-match=<file[=<value>]> trigger devices with a matching sysfs\n" | ||
94 | " attribute\n" | ||
95 | " --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n" | ||
96 | @@ -549,6 +587,8 @@ | ||
97 | exit: | ||
98 | name_list_cleanup(&filter_subsystem_match_list); | ||
99 | name_list_cleanup(&filter_subsystem_nomatch_list); | ||
100 | + name_list_cleanup(&filter_kernel_match_list); | ||
101 | + name_list_cleanup(&filter_kernel_nomatch_list); | ||
102 | name_list_cleanup(&filter_attr_match_list); | ||
103 | name_list_cleanup(&filter_attr_nomatch_list); | ||
104 | |||
diff --git a/meta/recipes-core/udev/udev-115/vol_id_ld.patch b/meta/recipes-core/udev/udev-115/vol_id_ld.patch deleted file mode 100644 index 11126eef8d..0000000000 --- a/meta/recipes-core/udev/udev-115/vol_id_ld.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- | ||
2 | extras/volume_id/Makefile | 2 +- | ||
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
4 | |||
5 | Index: udev-115/extras/volume_id/Makefile | ||
6 | =================================================================== | ||
7 | --- udev-115.orig/extras/volume_id/Makefile 2007-09-20 18:17:59.000000000 +0200 | ||
8 | +++ udev-115/extras/volume_id/Makefile 2007-09-20 18:18:08.000000000 +0200 | ||
9 | @@ -44,7 +44,7 @@ | ||
10 | ifeq ($(strip $(VOLUME_ID_STATIC)),true) | ||
11 | $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS) | ||
12 | else | ||
13 | - $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS) | ||
14 | + $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS) | ||
15 | endif | ||
16 | |||
17 | # man pages | ||
diff --git a/meta/recipes-core/udev/udev-124/flags.patch b/meta/recipes-core/udev/udev-124/flags.patch deleted file mode 100644 index 13f20eb6a8..0000000000 --- a/meta/recipes-core/udev/udev-124/flags.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | --- | ||
2 | Makefile | 16 ++++++++-------- | ||
3 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
4 | |||
5 | Index: udev-115/Makefile | ||
6 | =================================================================== | ||
7 | --- udev-115.orig/Makefile 2007-08-24 01:29:54.000000000 +0200 | ||
8 | +++ udev-115/Makefile 2007-09-20 17:21:45.000000000 +0200 | ||
9 | @@ -112,39 +112,39 @@ | ||
10 | AR = $(CROSS_COMPILE)ar | ||
11 | RANLIB = $(CROSS_COMPILE)ranlib | ||
12 | |||
13 | -CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
14 | +override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 | ||
15 | WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ | ||
16 | -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ | ||
17 | -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes | ||
18 | -CFLAGS += $(WARNINGS) | ||
19 | +override CFLAGS += $(WARNINGS) | ||
20 | |||
21 | LDFLAGS += -Wl,-warn-common,--as-needed | ||
22 | |||
23 | OPTFLAGS = -Os | ||
24 | -CFLAGS += $(OPTFLAGS) | ||
25 | +override CFLAGS += $(OPTFLAGS) | ||
26 | |||
27 | ifeq ($(strip $(USE_LOG)),true) | ||
28 | - CFLAGS += -DUSE_LOG | ||
29 | + override CFLAGS += -DUSE_LOG | ||
30 | endif | ||
31 | |||
32 | # if DEBUG is enabled, then we do not strip | ||
33 | ifeq ($(strip $(DEBUG)),true) | ||
34 | - CFLAGS += -DDEBUG | ||
35 | + override CFLAGS += -DDEBUG | ||
36 | endif | ||
37 | |||
38 | ifeq ($(strip $(USE_GCOV)),true) | ||
39 | - CFLAGS += -fprofile-arcs -ftest-coverage | ||
40 | + override CFLAGS += -fprofile-arcs -ftest-coverage | ||
41 | LDFLAGS += -fprofile-arcs | ||
42 | endif | ||
43 | |||
44 | ifeq ($(strip $(USE_SELINUX)),true) | ||
45 | UDEV_OBJS += udev_selinux.o | ||
46 | LIB_OBJS += -lselinux -lsepol | ||
47 | - CFLAGS += -DUSE_SELINUX | ||
48 | + override CFLAGS += -DUSE_SELINUX | ||
49 | endif | ||
50 | |||
51 | ifeq ($(strip $(USE_STATIC)),true) | ||
52 | - CFLAGS += -DUSE_STATIC | ||
53 | + override CFLAGS += -DUSE_STATIC | ||
54 | LDFLAGS += -static | ||
55 | endif | ||
56 | |||
diff --git a/meta/recipes-core/udev/udev-124/init b/meta/recipes-core/udev/udev-124/init deleted file mode 100644 index 32ab370aa9..0000000000 --- a/meta/recipes-core/udev/udev-124/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 0755 /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-124/local.rules b/meta/recipes-core/udev/udev-124/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-124/local.rules +++ /dev/null | |||
@@ -1,31 +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 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta/recipes-core/udev/udev-124/noasmlinkage.patch b/meta/recipes-core/udev/udev-124/noasmlinkage.patch deleted file mode 100644 index d58a7ea4de..0000000000 --- a/meta/recipes-core/udev/udev-124/noasmlinkage.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c | ||
2 | --- udev-124.orig/test-udev.c 2008-06-12 06:24:30.000000000 +0100 | ||
3 | +++ udev-124/test-udev.c 2008-07-07 14:43:37.000000000 +0100 | ||
4 | @@ -46,7 +46,7 @@ void log_message(int priority, const cha | ||
5 | } | ||
6 | #endif | ||
7 | |||
8 | -static void asmlinkage sig_handler(int signum) | ||
9 | +static void sig_handler(int signum) | ||
10 | { | ||
11 | switch (signum) { | ||
12 | case SIGALRM: | ||
13 | diff -pru udev-124.orig/udevd.c udev-124/udevd.c | ||
14 | --- udev-124.orig/udevd.c 2008-06-12 06:24:30.000000000 +0100 | ||
15 | +++ udev-124/udevd.c 2008-07-07 14:43:58.000000000 +0100 | ||
16 | @@ -87,7 +87,7 @@ void log_message(int priority, const cha | ||
17 | |||
18 | #endif | ||
19 | |||
20 | -static void asmlinkage udev_event_sig_handler(int signum) | ||
21 | +static void udev_event_sig_handler(int signum) | ||
22 | { | ||
23 | if (signum == SIGALRM) | ||
24 | exit(1); | ||
25 | @@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl | ||
26 | return msg; | ||
27 | } | ||
28 | |||
29 | -static void asmlinkage sig_handler(int signum) | ||
30 | +static void sig_handler(int signum) | ||
31 | { | ||
32 | switch (signum) { | ||
33 | case SIGINT: | ||
34 | diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c | ||
35 | --- udev-124.orig/udevmonitor.c 2008-06-12 06:24:30.000000000 +0100 | ||
36 | +++ udev-124/udevmonitor.c 2008-07-07 14:44:24.000000000 +0100 | ||
37 | @@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void | ||
38 | return 0; | ||
39 | } | ||
40 | |||
41 | -static void asmlinkage sig_handler(int signum) | ||
42 | +static void sig_handler(int signum) | ||
43 | { | ||
44 | if (signum == SIGINT || signum == SIGTERM) | ||
45 | udev_exit = 1; | ||
diff --git a/meta/recipes-core/udev/udev-124/permissions.rules b/meta/recipes-core/udev/udev-124/permissions.rules deleted file mode 100644 index 205b733292..0000000000 --- a/meta/recipes-core/udev/udev-124/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-124/run.rules b/meta/recipes-core/udev/udev-124/run.rules deleted file mode 100644 index 75d71375bb..0000000000 --- a/meta/recipes-core/udev/udev-124/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-124/udev.rules b/meta/recipes-core/udev/udev-124/udev.rules deleted file mode 100644 index a19d4a0bf6..0000000000 --- a/meta/recipes-core/udev/udev-124/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-124/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch deleted file mode 100644 index 5182542461..0000000000 --- a/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c | ||
2 | --- udev-124.orig/udevtrigger.c 2008-06-12 06:24:30.000000000 +0100 | ||
3 | +++ udev-124/udevtrigger.c 2008-07-07 15:10:09.000000000 +0100 | ||
4 | @@ -42,6 +42,8 @@ static int dry_run; | ||
5 | LIST_HEAD(device_list); | ||
6 | LIST_HEAD(filter_subsystem_match_list); | ||
7 | LIST_HEAD(filter_subsystem_nomatch_list); | ||
8 | +LIST_HEAD(filter_kernel_match_list); | ||
9 | +LIST_HEAD(filter_kernel_nomatch_list); | ||
10 | LIST_HEAD(filter_attr_match_list); | ||
11 | LIST_HEAD(filter_attr_nomatch_list); | ||
12 | static int sock = -1; | ||
13 | @@ -331,6 +333,26 @@ static int attr_match(const char *path, | ||
14 | return 0; | ||
15 | } | ||
16 | |||
17 | +static int kernel_filtered(const char *kernel) | ||
18 | +{ | ||
19 | + struct name_entry *loop_name; | ||
20 | + | ||
21 | + /* skip devices matching the prohibited kernel device names */ | ||
22 | + list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node) | ||
23 | + if (fnmatch(loop_name->name, kernel, 0) == 0) | ||
24 | + return 1; | ||
25 | + | ||
26 | + /* skip devices not matching the listed kernel device names */ | ||
27 | + if (!list_empty(&filter_kernel_match_list)) { | ||
28 | + list_for_each_entry(loop_name, &filter_kernel_match_list, node) | ||
29 | + if (fnmatch(loop_name->name, kernel, 0) == 0) | ||
30 | + return 0; | ||
31 | + return 1; | ||
32 | + } | ||
33 | + | ||
34 | + return 0; | ||
35 | +} | ||
36 | + | ||
37 | static int attr_filtered(const char *path) | ||
38 | { | ||
39 | struct name_entry *loop_name; | ||
40 | @@ -409,6 +431,9 @@ static void scan_subsystem(const char *s | ||
41 | if (dent2->d_name[0] == '.') | ||
42 | continue; | ||
43 | |||
44 | + if (kernel_filtered(dent2->d_name)) | ||
45 | + continue; | ||
46 | + | ||
47 | strlcpy(dirname2, dirname, sizeof(dirname2)); | ||
48 | strlcat(dirname2, "/", sizeof(dirname2)); | ||
49 | strlcat(dirname2, dent2->d_name, sizeof(dirname2)); | ||
50 | @@ -465,6 +490,9 @@ static void scan_block(void) | ||
51 | if (!strcmp(dent2->d_name,"device")) | ||
52 | continue; | ||
53 | |||
54 | + if (kernel_filtered(dent2->d_name)) | ||
55 | + continue; | ||
56 | + | ||
57 | strlcpy(dirname2, dirname, sizeof(dirname2)); | ||
58 | strlcat(dirname2, "/", sizeof(dirname2)); | ||
59 | strlcat(dirname2, dent2->d_name, sizeof(dirname2)); | ||
60 | @@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], | ||
61 | { "subsystem-nomatch", 1, NULL, 'S' }, | ||
62 | { "attr-match", 1, NULL, 'a' }, | ||
63 | { "attr-nomatch", 1, NULL, 'A' }, | ||
64 | + { "kernel-match", 1, NULL, 'k' }, | ||
65 | + { "kernel-nomatch", 1, NULL, 'K' }, | ||
66 | { "env", 1, NULL, 'e' }, | ||
67 | {} | ||
68 | }; | ||
69 | @@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], | ||
70 | case 'A': | ||
71 | name_list_add(&filter_attr_nomatch_list, optarg, 0); | ||
72 | break; | ||
73 | + case 'k': | ||
74 | + name_list_add(&filter_kernel_match_list, optarg, 0); | ||
75 | + break; | ||
76 | + case 'K': | ||
77 | + name_list_add(&filter_kernel_nomatch_list, optarg, 0); | ||
78 | + break; | ||
79 | case 'h': | ||
80 | printf("Usage: udevadm trigger OPTIONS\n" | ||
81 | " --verbose print the list of devices while running\n" | ||
82 | @@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], | ||
83 | " --env=<KEY>=<value> pass an additional key (works only with --socket=)\n" | ||
84 | " --subsystem-match=<subsystem> trigger devices from a matching subystem\n" | ||
85 | " --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n" | ||
86 | + " --kernel-match=<subsystem> trigger devices from a matching kernel device name\n" | ||
87 | + " --kernel-nomatch=<subsystem> exclude devices from a matching kernel device name\n" | ||
88 | " --attr-match=<file[=<value>]> trigger devices with a matching sysfs\n" | ||
89 | " attribute\n" | ||
90 | " --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n" | ||
91 | @@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], | ||
92 | exit: | ||
93 | name_list_cleanup(&filter_subsystem_match_list); | ||
94 | name_list_cleanup(&filter_subsystem_nomatch_list); | ||
95 | + name_list_cleanup(&filter_kernel_match_list); | ||
96 | + name_list_cleanup(&filter_kernel_nomatch_list); | ||
97 | name_list_cleanup(&filter_attr_match_list); | ||
98 | name_list_cleanup(&filter_attr_nomatch_list); | ||
99 | |||
diff --git a/meta/recipes-core/udev/udev-124/vol_id_ld.patch b/meta/recipes-core/udev/udev-124/vol_id_ld.patch deleted file mode 100644 index 11126eef8d..0000000000 --- a/meta/recipes-core/udev/udev-124/vol_id_ld.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- | ||
2 | extras/volume_id/Makefile | 2 +- | ||
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
4 | |||
5 | Index: udev-115/extras/volume_id/Makefile | ||
6 | =================================================================== | ||
7 | --- udev-115.orig/extras/volume_id/Makefile 2007-09-20 18:17:59.000000000 +0200 | ||
8 | +++ udev-115/extras/volume_id/Makefile 2007-09-20 18:18:08.000000000 +0200 | ||
9 | @@ -44,7 +44,7 @@ | ||
10 | ifeq ($(strip $(VOLUME_ID_STATIC)),true) | ||
11 | $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS) | ||
12 | else | ||
13 | - $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS) | ||
14 | + $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS) | ||
15 | endif | ||
16 | |||
17 | # man pages | ||
diff --git a/meta/recipes-core/udev/udev-141/igep0020/local.rules b/meta/recipes-core/udev/udev-141/igep0020/local.rules deleted file mode 100644 index db976d0419..0000000000 --- a/meta/recipes-core/udev/udev-141/igep0020/local.rules +++ /dev/null | |||
@@ -1,34 +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" | ||
diff --git a/meta/recipes-core/udev/udev-141/init b/meta/recipes-core/udev/udev-141/init deleted file mode 100644 index eb5e50758b..0000000000 --- a/meta/recipes-core/udev/udev-141/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-141/local.rules b/meta/recipes-core/udev/udev-141/local.rules deleted file mode 100644 index dab319b431..0000000000 --- a/meta/recipes-core/udev/udev-141/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-141/noasmlinkage.patch b/meta/recipes-core/udev/udev-141/noasmlinkage.patch deleted file mode 100644 index 6f9fe948f2..0000000000 --- a/meta/recipes-core/udev/udev-141/noasmlinkage.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Index: udev-141/udev/test-udev.c | ||
2 | =================================================================== | ||
3 | --- udev-141.orig/udev/test-udev.c 2008-10-24 09:07:24.000000000 +0100 | ||
4 | +++ udev-141/udev/test-udev.c 2009-04-14 15:34:01.000000000 +0100 | ||
5 | @@ -30,7 +30,7 @@ | ||
6 | |||
7 | #include "udev.h" | ||
8 | |||
9 | -static void asmlinkage sig_handler(int signum) | ||
10 | +static void sig_handler(int signum) | ||
11 | { | ||
12 | switch (signum) { | ||
13 | case SIGALRM: | ||
14 | Index: udev-141/udev/udevadm-monitor.c | ||
15 | =================================================================== | ||
16 | --- udev-141.orig/udev/udevadm-monitor.c 2009-03-29 19:07:01.000000000 +0100 | ||
17 | +++ udev-141/udev/udevadm-monitor.c 2009-04-14 15:34:01.000000000 +0100 | ||
18 | @@ -35,7 +35,7 @@ | ||
19 | |||
20 | static int udev_exit; | ||
21 | |||
22 | -static void asmlinkage sig_handler(int signum) | ||
23 | +static void sig_handler(int signum) | ||
24 | { | ||
25 | if (signum == SIGINT || signum == SIGTERM) | ||
26 | udev_exit = 1; | ||
27 | Index: udev-141/udev/udevd.c | ||
28 | =================================================================== | ||
29 | --- udev-141.orig/udev/udevd.c 2009-03-29 19:07:01.000000000 +0100 | ||
30 | +++ udev-141/udev/udevd.c 2009-04-14 15:34:56.000000000 +0100 | ||
31 | @@ -172,7 +172,7 @@ | ||
32 | udev_event_unref(event); | ||
33 | } | ||
34 | |||
35 | -static void asmlinkage event_sig_handler(int signum) | ||
36 | +static void event_sig_handler(int signum) | ||
37 | { | ||
38 | if (signum == SIGALRM) | ||
39 | exit(1); | ||
40 | @@ -583,7 +583,7 @@ | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | -static void asmlinkage sig_handler(int signum) | ||
45 | +static void sig_handler(int signum) | ||
46 | { | ||
47 | switch (signum) { | ||
48 | case SIGINT: | ||
diff --git a/meta/recipes-core/udev/udev-141/permissions.rules b/meta/recipes-core/udev/udev-141/permissions.rules deleted file mode 100644 index 205b733292..0000000000 --- a/meta/recipes-core/udev/udev-141/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-141/run.rules b/meta/recipes-core/udev/udev-141/run.rules deleted file mode 100644 index 75d71375bb..0000000000 --- a/meta/recipes-core/udev/udev-141/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-141/udev.rules b/meta/recipes-core/udev/udev-141/udev.rules deleted file mode 100644 index a19d4a0bf6..0000000000 --- a/meta/recipes-core/udev/udev-141/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-141/unbreak.patch b/meta/recipes-core/udev/udev-141/unbreak.patch deleted file mode 100644 index bb5988dca4..0000000000 --- a/meta/recipes-core/udev/udev-141/unbreak.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Index: udev-141/extras/volume_id/lib/Makefile.am | ||
2 | =================================================================== | ||
3 | --- udev-141.orig/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:16.000000000 +0100 | ||
4 | +++ udev-141/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:26.000000000 +0100 | ||
5 | @@ -54,19 +54,6 @@ | ||
6 | -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ | ||
7 | -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols | ||
8 | |||
9 | -# move devel files to $(prefix)$(libdir_name) if needed | ||
10 | -install-data-hook: | ||
11 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.la | ||
12 | - if test "$(prefix)" != "$(exec_prefix)"; then \ | ||
13 | - mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ | ||
14 | - mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \ | ||
15 | - so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \ | ||
16 | - rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ | ||
17 | - so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ | ||
18 | - ln -sf $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \ | ||
19 | - $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ | ||
20 | - fi | ||
21 | - | ||
22 | EXTRA_DIST = \ | ||
23 | exported_symbols | ||
24 | |||
diff --git a/meta/recipes-core/udev/udev_092.bb b/meta/recipes-core/udev/udev_092.bb deleted file mode 100644 index 0e94d1f6c8..0000000000 --- a/meta/recipes-core/udev/udev_092.bb +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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 \ | ||
3 | the hotplug package and requires a kernel not older than 2.6.12." | ||
4 | RPROVIDES_${PN} = "hotplug" | ||
5 | |||
6 | PR = "r17" | ||
7 | |||
8 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
9 | file://noasmlinkage.patch;patch=1 \ | ||
10 | file://flags.patch;patch=1 \ | ||
11 | file://udevsynthesize.patch;patch=1 \ | ||
12 | file://udevsynthesize.sh \ | ||
13 | file://arm_inotify_fix.patch;patch=1 \ | ||
14 | " | ||
15 | |||
16 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
17 | PACKAGE_ARCH_h2200 = "h2200" | ||
18 | |||
19 | require udev.inc | ||
20 | |||
21 | INITSCRIPT_PARAMS = "start 03 S ." | ||
22 | |||
23 | FILES_${PN} += "${base_libdir}/udev/*" | ||
24 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | ||
25 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" | ||
26 | EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" | ||
27 | |||
28 | do_install () { | ||
29 | install -d ${D}${usrsbindir} \ | ||
30 | ${D}${sbindir} | ||
31 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
32 | install -d ${D}${sysconfdir}/init.d | ||
33 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
34 | install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache | ||
35 | |||
36 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
37 | |||
38 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
39 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
40 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
41 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
42 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
43 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
44 | fi | ||
45 | |||
46 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
47 | |||
48 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
49 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
50 | |||
51 | install -d ${D}${base_libdir}/udev/ | ||
52 | install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize | ||
53 | install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize | ||
54 | } | ||
55 | |||
56 | do_install_append_h2200() { | ||
57 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
58 | } | ||
diff --git a/meta/recipes-core/udev/udev_115.bb b/meta/recipes-core/udev/udev_115.bb deleted file mode 100644 index 9db8661b61..0000000000 --- a/meta/recipes-core/udev/udev_115.bb +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
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 \ | ||
3 | the hotplug package and requires a kernel not older than 2.6.12." | ||
4 | RPROVIDES_${PN} = "hotplug" | ||
5 | |||
6 | PR = "r5" | ||
7 | |||
8 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
9 | file://noasmlinkage.patch;patch=1 \ | ||
10 | file://flags.patch;patch=1 \ | ||
11 | file://vol_id_ld.patch;patch=1 \ | ||
12 | file://udevtrigger_add_devname_filtering.patch;patch=1 \ | ||
13 | " | ||
14 | |||
15 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
16 | PACKAGE_ARCH_h2200 = "h2200" | ||
17 | |||
18 | require udev.inc | ||
19 | |||
20 | INITSCRIPT_PARAMS = "start 03 S ." | ||
21 | |||
22 | FILES_${PN} += "${base_libdir}/udev/*" | ||
23 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | ||
24 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" | ||
25 | EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" | ||
26 | |||
27 | do_install () { | ||
28 | install -d ${D}${usrsbindir} \ | ||
29 | ${D}${sbindir} | ||
30 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
31 | install -d ${D}${sysconfdir}/init.d | ||
32 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
33 | install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache | ||
34 | |||
35 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
36 | |||
37 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
38 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
39 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
40 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
41 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
42 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
43 | fi | ||
44 | |||
45 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
46 | |||
47 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
48 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
49 | |||
50 | install -d ${D}${base_libdir}/udev/ | ||
51 | } | ||
52 | |||
53 | do_install_append_h2200() { | ||
54 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
55 | } | ||
diff --git a/meta/recipes-core/udev/udev_124.bb b/meta/recipes-core/udev/udev_124.bb deleted file mode 100644 index ccfbbf7018..0000000000 --- a/meta/recipes-core/udev/udev_124.bb +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
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 \ | ||
3 | the hotplug package and requires a kernel not older than 2.6.12." | ||
4 | RPROVIDES_${PN} = "hotplug" | ||
5 | |||
6 | PR = "r10" | ||
7 | |||
8 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
9 | file://noasmlinkage.patch;patch=1 \ | ||
10 | file://flags.patch;patch=1 \ | ||
11 | file://vol_id_ld.patch;patch=1 \ | ||
12 | file://udevtrigger_add_devname_filtering.patch;patch=1 \ | ||
13 | file://run.rules \ | ||
14 | " | ||
15 | |||
16 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
17 | PACKAGE_ARCH_h2200 = "h2200" | ||
18 | |||
19 | require udev.inc | ||
20 | |||
21 | INITSCRIPT_PARAMS = "start 03 S ." | ||
22 | |||
23 | FILES_${PN} += "${base_libdir}/udev/*" | ||
24 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | ||
25 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" | ||
26 | EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" | ||
27 | |||
28 | do_install () { | ||
29 | install -d ${D}${usrsbindir} \ | ||
30 | ${D}${sbindir} | ||
31 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
32 | install -d ${D}${sysconfdir}/init.d | ||
33 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
34 | install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache | ||
35 | |||
36 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
37 | |||
38 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
39 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
40 | install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules | ||
41 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
42 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
43 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
44 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
45 | fi | ||
46 | |||
47 | # Remove some default rules that don't work well on embedded devices | ||
48 | rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules | ||
49 | rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules | ||
50 | rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules | ||
51 | |||
52 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
53 | |||
54 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
55 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
56 | |||
57 | install -d ${D}${base_libdir}/udev/ | ||
58 | } | ||
59 | |||
60 | do_install_append_h2200() { | ||
61 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
62 | } | ||
diff --git a/meta/recipes-core/udev/udev_141.bb b/meta/recipes-core/udev/udev_141.bb deleted file mode 100644 index 3893a98a2d..0000000000 --- a/meta/recipes-core/udev/udev_141.bb +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
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 \ | ||
3 | the hotplug package and requires a kernel not older than 2.6.12." | ||
4 | RPROVIDES_${PN} = "hotplug" | ||
5 | |||
6 | PR = "r8" | ||
7 | |||
8 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
9 | file://noasmlinkage.patch;patch=1 \ | ||
10 | file://unbreak.patch;patch=1 \ | ||
11 | file://run.rules \ | ||
12 | " | ||
13 | |||
14 | SRC_URI_append_h2200 = " file://50-hostap_cs.rules " | ||
15 | PACKAGE_ARCH_h2200 = "h2200" | ||
16 | |||
17 | require udev.inc | ||
18 | |||
19 | FILES_${PN} += "${base_libdir}/udev/*" | ||
20 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | ||
21 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" | ||
22 | #EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" | ||
23 | |||
24 | exec_prefix = "" | ||
25 | |||
26 | EXTRA_OECONF = "--with-udev-prefix=" | ||
27 | |||
28 | do_install () { | ||
29 | install -d ${D}${usrsbindir} \ | ||
30 | ${D}${sbindir} | ||
31 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
32 | install -d ${D}${sysconfdir}/init.d | ||
33 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
34 | install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache | ||
35 | |||
36 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
37 | |||
38 | cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ | ||
39 | cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ | ||
40 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
41 | #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
42 | #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules | ||
43 | #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
44 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
45 | #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
46 | # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
47 | #fi | ||
48 | |||
49 | # Remove some default rules that don't work well on embedded devices | ||
50 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules | ||
51 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules | ||
52 | #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules | ||
53 | |||
54 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
55 | |||
56 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
57 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
58 | |||
59 | install -d ${D}${base_libdir}/udev/ | ||
60 | } | ||
61 | |||
62 | do_install_append_h2200() { | ||
63 | install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules | ||
64 | } | ||
65 | |||