diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /openembedded/packages/udev | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/udev')
37 files changed, 0 insertions, 3176 deletions
diff --git a/openembedded/packages/udev/files/akita/mount.blacklist b/openembedded/packages/udev/files/akita/mount.blacklist deleted file mode 100644 index 7e351bc988..0000000000 --- a/openembedded/packages/udev/files/akita/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/files/c7x0/mount.blacklist b/openembedded/packages/udev/files/c7x0/mount.blacklist deleted file mode 100644 index 7e351bc988..0000000000 --- a/openembedded/packages/udev/files/c7x0/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/files/devfs-udev.rules b/openembedded/packages/udev/files/devfs-udev.rules deleted file mode 100644 index 0ba1ad4e7f..0000000000 --- a/openembedded/packages/udev/files/devfs-udev.rules +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | # The use of these rules is not recommended or supported. | ||
2 | # In a world where devices can come and go at any time, the devfs scheme | ||
3 | # of simple device enumeration does not help _anything_. Just forget about | ||
4 | # it. Use custom rules to name your device or look at the persistent device | ||
5 | # naming scheme, which is implemented for disks and add your subsystem. | ||
6 | |||
7 | # ide block devices | ||
8 | BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}" | ||
9 | |||
10 | # md block devices | ||
11 | KERNEL="md[0-9]*", NAME="md/%n" | ||
12 | |||
13 | # floppy devices | ||
14 | KERNEL="fd[0-9]*", NAME="floppy/%n" | ||
15 | |||
16 | # tty devices | ||
17 | KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" | ||
18 | KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" | ||
19 | KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" | ||
20 | |||
21 | # vc devices | ||
22 | KERNEL="vcs", NAME="vcc/0" | ||
23 | KERNEL="vcs[0-9]*", NAME="vcc/%n" | ||
24 | KERNEL="vcsa", NAME="vcc/a0" | ||
25 | KERNEL="vcsa[0-9]*", NAME="vcc/a%n" | ||
26 | |||
27 | # v4l devices | ||
28 | KERNEL="video[0-9]*", NAME="v4l/video%n" | ||
29 | KERNEL="radio[0-9]*", NAME="v4l/radio%n" | ||
30 | KERNEL="vbi[0-9]*", NAME="v4l/vbi%n" | ||
31 | KERNEL="vtx[0-9]*", NAME="v4l/vtx%n" | ||
32 | |||
33 | # dm devices (ignore them) | ||
34 | KERNEL="dm-[0-9]*", NAME="" | ||
35 | |||
36 | # i2c devices | ||
37 | KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k" | ||
38 | |||
39 | # loop devices | ||
40 | KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k" | ||
41 | |||
42 | # ramdisks | ||
43 | KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k" | ||
44 | |||
45 | # framebuffer devices | ||
46 | KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k" | ||
47 | |||
48 | # misc | ||
49 | KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" | ||
50 | KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" | ||
51 | KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k" | ||
52 | KERNEL="rtc", NAME="misc/%k", SYMLINK="%k" | ||
53 | KERNEL="psaux", NAME="misc/%k", SYMLINK="%k" | ||
54 | KERNEL="uinput", NAME="misc/%k", SYMLINK="%k" | ||
55 | |||
56 | # alsa devices | ||
57 | KERNEL="controlC[0-9]*", NAME="snd/%k" | ||
58 | KERNEL="hw[CD0-9]*", NAME="snd/%k" | ||
59 | KERNEL="pcm[CD0-9cp]*", NAME="snd/%k" | ||
60 | KERNEL="midi[CD0-9]*", NAME="snd/%k" | ||
61 | KERNEL="timer", NAME="snd/%k" | ||
62 | KERNEL="seq", NAME="snd/%k" | ||
63 | |||
64 | # oss devices | ||
65 | KERNEL="audio*", NAME="sound/%k", SYMLINK="%k" | ||
66 | KERNEL="dmmidi", NAME="sound/%k", SYMLINK="%k" | ||
67 | KERNEL="dsp*", NAME="sound/%k", SYMLINK="%k" | ||
68 | KERNEL="midi*", NAME="sound/%k", SYMLINK="%k" | ||
69 | KERNEL="mixer*", NAME="sound/%k", SYMLINK="%k" | ||
70 | KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k" | ||
71 | |||
72 | # input devices | ||
73 | KERNEL="mice", NAME="input/%k" | ||
74 | KERNEL="mouse*", NAME="input/%k" | ||
75 | KERNEL="event*", NAME="input/%k" | ||
76 | KERNEL="js*", NAME="input/%k" | ||
77 | KERNEL="ts*", NAME="input/%k" | ||
78 | |||
79 | # USB devices | ||
80 | KERNEL="hiddev*", NAME="usb/%k" | ||
81 | KERNEL="auer*", NAME="usb/%k" | ||
82 | KERNEL="legousbtower*", NAME="usb/%k" | ||
83 | KERNEL="dabusb*", NAME="usb/%k" | ||
84 | BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" | ||
85 | |||
86 | # netlink devices | ||
87 | KERNEL="route", NAME="netlink/%k" | ||
88 | KERNEL="skip", NAME="netlink/%k" | ||
89 | KERNEL="usersock", NAME="netlink/%k" | ||
90 | KERNEL="fwmonitor", NAME="netlink/%k" | ||
91 | KERNEL="tcpdiag", NAME="netlink/%k" | ||
92 | KERNEL="nflog", NAME="netlink/%k" | ||
93 | KERNEL="xfrm", NAME="netlink/%k" | ||
94 | KERNEL="arpd", NAME="netlink/%k" | ||
95 | KERNEL="route6", NAME="netlink/%k" | ||
96 | KERNEL="ip6_fw", NAME="netlink/%k" | ||
97 | KERNEL="dnrtmsg", NAME="netlink/%k" | ||
98 | KERNEL="tap*", NAME="netlink/%k" | ||
99 | |||
100 | # CAPI devices | ||
101 | KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20" | ||
102 | KERNEL="capi*", NAME="capi/%n" | ||
103 | |||
104 | # Network devices | ||
105 | KERNEL="tun", NAME="net/%k" | ||
106 | |||
107 | # raw devices | ||
108 | KERNEL="raw[0-9]*", NAME="raw/%k" | ||
diff --git a/openembedded/packages/udev/files/fix-alignment.patch b/openembedded/packages/udev/files/fix-alignment.patch deleted file mode 100644 index 8c7b8b5ac5..0000000000 --- a/openembedded/packages/udev/files/fix-alignment.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | diff --git a/udev_rules_parse.c b/udev_rules_parse.c | ||
2 | --- a/udev_rules_parse.c | ||
3 | +++ b/udev_rules_parse.c | ||
4 | @@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule | ||
5 | int valid; | ||
6 | char *linepos; | ||
7 | char *attr; | ||
8 | + size_t padding; | ||
9 | int retval; | ||
10 | |||
11 | /* get all the keys */ | ||
12 | @@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule | ||
13 | |||
14 | /* grow buffer and add rule */ | ||
15 | rule_size = sizeof(struct udev_rule) + rule->bufsize; | ||
16 | + padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t); | ||
17 | + dbg("add %zi padding bytes", padding); | ||
18 | + rule_size += padding; | ||
19 | + rule->bufsize += padding; | ||
20 | + | ||
21 | rules->buf = realloc(rules->buf, rules->bufsize + rule_size); | ||
22 | if (!rules->buf) { | ||
23 | err("realloc failed"); | ||
24 | |||
diff --git a/openembedded/packages/udev/files/init b/openembedded/packages/udev/files/init deleted file mode 100755 index 1022b40c89..0000000000 --- a/openembedded/packages/udev/files/init +++ /dev/null | |||
@@ -1,208 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | |||
3 | UDEVSTART=/sbin/udevstart | ||
4 | |||
5 | # defaults | ||
6 | tmpfs_size="10M" | ||
7 | udev_root="/dev" | ||
8 | |||
9 | [ -x $UDEVSTART ] || exit 0 | ||
10 | |||
11 | . /etc/udev/udev.conf | ||
12 | |||
13 | ############################################################################## | ||
14 | |||
15 | # we need to unmount /dev/pts/ and remount it later over the tmpfs | ||
16 | unmount_devpts() { | ||
17 | if mountpoint -q /dev/pts/; then | ||
18 | umount -l /dev/pts/ | ||
19 | fi | ||
20 | |||
21 | if mountpoint -q /dev/shm/; then | ||
22 | umount -l /dev/shm/ | ||
23 | fi | ||
24 | } | ||
25 | |||
26 | # mount a tmpfs over /dev, if somebody did not already do it | ||
27 | mount_tmpfs() { | ||
28 | if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then | ||
29 | return 0 | ||
30 | fi | ||
31 | |||
32 | # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. | ||
33 | # /etc/udev/ is recycled as a temporary mount point because it's the only | ||
34 | # directory which is guaranteed to be available. | ||
35 | mount -n -o bind /dev /etc/udev | ||
36 | |||
37 | if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then | ||
38 | umount /etc/udev | ||
39 | echo "udev requires tmpfs support, not started." | ||
40 | exit 1 | ||
41 | fi | ||
42 | |||
43 | # using ln to test if /dev works, because touch is in /usr/bin/ | ||
44 | if ln -s test /dev/test-file; then | ||
45 | rm /dev/test-file | ||
46 | else | ||
47 | echo "udev requires tmpfs support, not started." | ||
48 | umount /etc/udev | ||
49 | umount /dev | ||
50 | exit 1 | ||
51 | fi | ||
52 | |||
53 | mkdir -p /dev/.static/dev | ||
54 | chmod 700 /dev/.static/ | ||
55 | # The mount options in busybox are non-standard... | ||
56 | if test -x /bin/mount.util-linux | ||
57 | then | ||
58 | /bin/mount.util-linux --move /etc/udev /dev/.static/dev | ||
59 | elif test -x /bin/busybox | ||
60 | then | ||
61 | busybox mount -n -o move /etc/udev /dev/.static/dev | ||
62 | else | ||
63 | echo "udev requires an identifiable mount command, not started." | ||
64 | umount /etc/udev | ||
65 | umount /dev | ||
66 | exit 1 | ||
67 | fi | ||
68 | } | ||
69 | |||
70 | # I hate this hack. -- Md | ||
71 | make_extra_nodes() { | ||
72 | [ -e /etc/udev/links.conf ] || return 0 | ||
73 | grep '^[^#]' /etc/udev/links.conf | \ | ||
74 | while read type name arg1; do | ||
75 | [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue | ||
76 | case "$type" in | ||
77 | L) ln -s $arg1 /dev/$name ;; | ||
78 | D) mkdir -p /dev/$name ;; | ||
79 | M) mknod -m 600 /dev/$name $arg1 ;; | ||
80 | *) echo "links.conf: unparseable line ($type $name $arg1)" ;; | ||
81 | esac | ||
82 | done | ||
83 | } | ||
84 | |||
85 | # this function is duplicated in preinst, postinst and d-i | ||
86 | supported_kernel() { | ||
87 | case "$(uname -r)" in | ||
88 | 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; | ||
89 | 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; | ||
90 | esac | ||
91 | return 0 | ||
92 | } | ||
93 | |||
94 | # shell version of /usr/bin/tty | ||
95 | my_tty() { | ||
96 | [ -x /bin/readlink ] || return 0 | ||
97 | [ -e /proc/self/fd/0 ] || return 0 | ||
98 | readlink --silent /proc/self/fd/0 || true | ||
99 | } | ||
100 | |||
101 | warn_if_interactive() { | ||
102 | if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then | ||
103 | return 0 | ||
104 | fi | ||
105 | |||
106 | TTY=$(my_tty) | ||
107 | if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then | ||
108 | return 0 | ||
109 | fi | ||
110 | |||
111 | printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" | ||
112 | printf "has been run from an interactive shell.\n" | ||
113 | printf "It will probably not do what you expect, so this script will wait\n" | ||
114 | printf "60 seconds before continuing. Press ^C to stop it.\n" | ||
115 | printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" | ||
116 | sleep 60 | ||
117 | } | ||
118 | |||
119 | ############################################################################## | ||
120 | |||
121 | if ! supported_kernel; then | ||
122 | echo "udev requires a kernel >= 2.6.12, not started." | ||
123 | exit 1 | ||
124 | fi | ||
125 | |||
126 | if [ ! -e /proc/filesystems ]; then | ||
127 | echo "udev requires a mounted procfs, not started." | ||
128 | exit 1 | ||
129 | fi | ||
130 | |||
131 | if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then | ||
132 | echo "udev requires tmpfs support, not started." | ||
133 | exit 1 | ||
134 | fi | ||
135 | |||
136 | if [ ! -d /sys/class/ ]; then | ||
137 | echo "udev requires a mounted sysfs, not started." | ||
138 | exit 1 | ||
139 | fi | ||
140 | |||
141 | if [ ! -e /proc/sys/kernel/hotplug ]; then | ||
142 | echo "udev requires hotplug support, not started." | ||
143 | exit 1 | ||
144 | fi | ||
145 | |||
146 | ############################################################################## | ||
147 | |||
148 | # When modifying this script, do not forget that between the time that | ||
149 | # the new /dev has been mounted and udevstart has been run there will be | ||
150 | # no /dev/null. This also means that you cannot use the "&" shell command. | ||
151 | |||
152 | case "$1" in | ||
153 | start) | ||
154 | if [ -e "$udev_root/.udevdb" ]; then | ||
155 | if mountpoint -q /dev/; then | ||
156 | TMPFS_MOUNTED=1 | ||
157 | else | ||
158 | echo ".udevdb already exists on the old $udev_root!" | ||
159 | fi | ||
160 | fi | ||
161 | warn_if_interactive | ||
162 | |||
163 | #echo /sbin/udevsend > /proc/sys/kernel/hotplug | ||
164 | echo "" > /proc/sys/kernel/hotplug | ||
165 | udevsend | ||
166 | if [ "$UDEV_DISABLED" = "yes" ]; then | ||
167 | echo "udev disabled on the kernel command line, not started." | ||
168 | exit 0 | ||
169 | fi | ||
170 | |||
171 | if [ ! "$TMPFS_MOUNTED" ]; then | ||
172 | unmount_devpts | ||
173 | mount_tmpfs | ||
174 | [ -d /proc/1 ] || mount -n /proc | ||
175 | # if this directory is not present /dev will not be updated by udev | ||
176 | mkdir /dev/.udevdb/ | ||
177 | echo "Creating initial device nodes..." | ||
178 | udevstart | ||
179 | fi | ||
180 | make_extra_nodes | ||
181 | ;; | ||
182 | stop) | ||
183 | warn_if_interactive | ||
184 | start-stop-daemon --stop --exec /sbin/udevd --quiet | ||
185 | unmount_devpts | ||
186 | if [ -d /dev/.static/dev/ ]; then | ||
187 | umount -l /dev/.static/dev/ || true | ||
188 | fi | ||
189 | echo "Unmounting /dev..." | ||
190 | # unmounting with -l should never fail | ||
191 | if ! umount -l /dev; then | ||
192 | exit 1 | ||
193 | fi | ||
194 | ;; | ||
195 | restart|force-reload) | ||
196 | start-stop-daemon --stop --exec /sbin/udevd --quiet | ||
197 | log_begin_msg "Recreating device nodes..." | ||
198 | udevstart | ||
199 | make_extra_nodes | ||
200 | log_end_msg 0 | ||
201 | ;; | ||
202 | *) | ||
203 | echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" | ||
204 | exit 1 | ||
205 | ;; | ||
206 | esac | ||
207 | |||
208 | exit 0 | ||
diff --git a/openembedded/packages/udev/files/links.conf b/openembedded/packages/udev/files/links.conf deleted file mode 100644 index 8fff922db6..0000000000 --- a/openembedded/packages/udev/files/links.conf +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # This file does not exist. Please do not ask the debian maintainer about it. | ||
2 | # You may use it to do strange and wonderful things, at your risk. | ||
3 | |||
4 | L fd /proc/self/fd | ||
5 | L stdin /proc/self/fd/0 | ||
6 | L stdout /proc/self/fd/1 | ||
7 | L stderr /proc/self/fd/2 | ||
8 | L core /proc/kcore | ||
9 | L sndstat /proc/asound/oss/sndstat | ||
10 | L MAKEDEV /sbin/MAKEDEV | ||
11 | |||
12 | D pts | ||
13 | D shm | ||
14 | |||
15 | # Hic sunt leones. | ||
16 | M ppp c 108 0 | ||
17 | D loop | ||
18 | M loop/0 b 7 0 | ||
19 | D net | ||
20 | M net/tun c 10 200 | ||
21 | |||
diff --git a/openembedded/packages/udev/files/local.rules b/openembedded/packages/udev/files/local.rules deleted file mode 100644 index 5f2efbeb0c..0000000000 --- a/openembedded/packages/udev/files/local.rules +++ /dev/null | |||
@@ -1,22 +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" | ||
diff --git a/openembedded/packages/udev/files/mount.blacklist b/openembedded/packages/udev/files/mount.blacklist deleted file mode 100644 index 1e7340aa53..0000000000 --- a/openembedded/packages/udev/files/mount.blacklist +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | /dev/loop | ||
2 | /dev/ram \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/files/mount.sh b/openembedded/packages/udev/files/mount.sh deleted file mode 100644 index 48c7844690..0000000000 --- a/openembedded/packages/udev/files/mount.sh +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Called from udev | ||
4 | # Attemp to mount any added block devices | ||
5 | # and remove any removed devices | ||
6 | # | ||
7 | |||
8 | MOUNT="/bin/mount" | ||
9 | PMOUNT="/usr/bin/pmount" | ||
10 | UMOUNT="/bin/umount" | ||
11 | name="`basename "$DEVNAME"`" | ||
12 | |||
13 | for line in `cat /etc/udev/mount.blacklist | grep -v ^#` | ||
14 | do | ||
15 | if ( echo "$DEVNAME" | grep -q "$line" ) | ||
16 | then | ||
17 | logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" | ||
18 | exit 0 | ||
19 | fi | ||
20 | done | ||
21 | |||
22 | automount() { | ||
23 | ! test -d "/media/$name" && mkdir -p "/media/$name" | ||
24 | |||
25 | if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name" | ||
26 | then | ||
27 | #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" | ||
28 | rm_dir "/media/$name" | ||
29 | else | ||
30 | logger "mount.sh/automount" "Auto-mount of [/media/$name] successful" | ||
31 | touch "/tmp/.automount-$name" | ||
32 | fi | ||
33 | } | ||
34 | |||
35 | rm_dir() { | ||
36 | # We do not want to rm -r populated directories | ||
37 | if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" | ||
38 | then | ||
39 | ! test -z "$1" && rm -r "$1" | ||
40 | else | ||
41 | logger "mount.sh/automount" "Not removing non-empty directory [$1]" | ||
42 | fi | ||
43 | } | ||
44 | |||
45 | if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then | ||
46 | if [ -x "$PMOUNT" ]; then | ||
47 | $PMOUNT $DEVNAME 2> /dev/null | ||
48 | elif [ -x $MOUNT ]; then | ||
49 | $MOUNT $DEVNAME 2> /dev/null | ||
50 | fi | ||
51 | |||
52 | # If the device isn't mounted at this point, it isn't configured in fstab | ||
53 | cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount | ||
54 | |||
55 | fi | ||
56 | |||
57 | |||
58 | |||
59 | if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then | ||
60 | for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " ` | ||
61 | do | ||
62 | $UMOUNT $mnt | ||
63 | done | ||
64 | |||
65 | # Remove empty directories from auto-mounter | ||
66 | test -e "/tmp/.automount-$name" && rm_dir "/media/$name" | ||
67 | fi | ||
diff --git a/openembedded/packages/udev/files/network.sh b/openembedded/packages/udev/files/network.sh deleted file mode 100644 index 5016328df4..0000000000 --- a/openembedded/packages/udev/files/network.sh +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # Do not run when pcmcia-cs is installed | ||
4 | test -x /sbin/cardctl && exit 0 | ||
5 | |||
6 | # We get two "add" events for hostap cards due to wifi0 | ||
7 | echo "$INTERFACE" | grep -q wifi && exit 0 | ||
8 | |||
9 | |||
10 | # Check if /etc/init.d/network has been run yet to see if we are | ||
11 | # called by starting /etc/rcS.d/S03udev and not by hotplugging a device | ||
12 | # | ||
13 | # At this stage, network interfaces should not be brought up | ||
14 | # automatically because: | ||
15 | # a) /etc/init.d/network has not been run yet (security issue) | ||
16 | # b) /var has not been populated yet so /etc/resolv,conf points to | ||
17 | # oblivion, making the network unusable | ||
18 | # | ||
19 | |||
20 | spoofp="`grep ^spoofprotect /etc/network/options`" | ||
21 | if test -z "$spoofp" | ||
22 | then | ||
23 | # This is the default from /etc/init.d/network | ||
24 | spoofp_val=yes | ||
25 | else | ||
26 | spoofp_val=${spoofp#spoofprotect=} | ||
27 | fi | ||
28 | |||
29 | test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 | ||
30 | |||
31 | # I think it is safe to assume that "lo" will always be there ;) | ||
32 | if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" | ||
33 | then | ||
34 | echo "$INTERFACE" >> /dev/udev_network_queue | ||
35 | exit 0 | ||
36 | fi | ||
37 | |||
38 | # | ||
39 | # Code taken from pcmcia-cs:/etc/pcmcia/network | ||
40 | # | ||
41 | |||
42 | # if this interface has an entry in /etc/network/interfaces, let ifupdown | ||
43 | # handle it | ||
44 | if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then | ||
45 | case $ACTION in | ||
46 | add) | ||
47 | ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE | ||
48 | ;; | ||
49 | remove) | ||
50 | ifdown $INTERFACE | ||
51 | ;; | ||
52 | esac | ||
53 | |||
54 | exit 0 | ||
55 | fi | ||
diff --git a/openembedded/packages/udev/files/noasmlinkage.patch b/openembedded/packages/udev/files/noasmlinkage.patch deleted file mode 100644 index 0d8e854c0e..0000000000 --- a/openembedded/packages/udev/files/noasmlinkage.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- udev-062/udev.c~noasmlinkage.patch | ||
7 | +++ udev-062/udev.c | ||
8 | @@ -54,7 +54,7 @@ | ||
9 | } | ||
10 | #endif | ||
11 | |||
12 | -static void asmlinkage sig_handler(int signum) | ||
13 | +static void sig_handler(int signum) | ||
14 | { | ||
15 | switch (signum) { | ||
16 | case SIGALRM: | ||
17 | --- udev-062/udevd.c~noasmlinkage.patch | ||
18 | +++ udev-062/udevd.c | ||
19 | @@ -639,7 +639,7 @@ | ||
20 | return msg; | ||
21 | } | ||
22 | |||
23 | -static void asmlinkage sig_handler(int signum) | ||
24 | +static void sig_handler(int signum) | ||
25 | { | ||
26 | int rc; | ||
27 | |||
28 | --- udev-062/udevstart.c~noasmlinkage.patch | ||
29 | +++ udev-062/udevstart.c | ||
30 | @@ -323,7 +323,7 @@ | ||
31 | exec_list(&device_list); | ||
32 | } | ||
33 | |||
34 | -static void asmlinkage sig_handler(int signum) | ||
35 | +static void sig_handler(int signum) | ||
36 | { | ||
37 | switch (signum) { | ||
38 | case SIGALRM: | ||
diff --git a/openembedded/packages/udev/files/permissions.rules b/openembedded/packages/udev/files/permissions.rules deleted file mode 100644 index 86d771276b..0000000000 --- a/openembedded/packages/udev/files/permissions.rules +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | # default permissions for block devices | ||
2 | SUBSYSTEM=="block", GROUP="disk" | ||
3 | SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" | ||
4 | |||
5 | # IDE devices | ||
6 | BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}="1", \ | ||
7 | PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom*", GROUP="cdrom" | ||
8 | BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" | ||
9 | BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" | ||
10 | |||
11 | # SCSI devices | ||
12 | BUS=="scsi", SYSFS{type}=="1", GROUP="tape" | ||
13 | BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" | ||
14 | BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" | ||
15 | |||
16 | # USB devices | ||
17 | BUS=="usb", KERNEL=="legousbtower*", MODE="0666" | ||
18 | BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" | ||
19 | |||
20 | # serial devices | ||
21 | SUBSYSTEM=="tty", GROUP="dialout" | ||
22 | SUBSYSTEM=="capi", GROUP="dialout" | ||
23 | SUBSYSTEM=="slamr", GROUP="dialout" | ||
24 | |||
25 | # vc devices (all members of the tty subsystem) | ||
26 | KERNEL=="ptmx", MODE="0666", GROUP="root" | ||
27 | KERNEL=="console", MODE="0600", GROUP="root" | ||
28 | KERNEL=="tty", MODE="0666", GROUP="root" | ||
29 | KERNEL=="tty[0-9]*", GROUP="root" | ||
30 | KERNEL=="pty*", MODE="0666", GROUP="tty" | ||
31 | |||
32 | # video devices | ||
33 | SUBSYSTEM=="video4linux", GROUP="video" | ||
34 | SUBSYSTEM=="drm", GROUP="video" | ||
35 | SUBSYSTEM=="dvb", GROUP="video" | ||
36 | SUBSYSTEM=="em8300", GROUP="video" | ||
37 | SUBSYSTEM=="graphics", GROUP="video" | ||
38 | SUBSYSTEM=="nvidia", GROUP="video" | ||
39 | |||
40 | # misc devices | ||
41 | KERNEL=="random", MODE="0666" | ||
42 | KERNEL=="urandom", MODE="0444" | ||
43 | KERNEL=="mem", MODE="0640", GROUP="kmem" | ||
44 | KERNEL=="kmem", MODE="0640", GROUP="kmem" | ||
45 | KERNEL=="port", MODE="0640", GROUP="kmem" | ||
46 | KERNEL=="full", MODE="0666" | ||
47 | KERNEL=="null", MODE="0666" | ||
48 | KERNEL=="zero", MODE="0666" | ||
49 | KERNEL=="inotify", MODE="0666" | ||
50 | KERNEL=="sgi_fetchop", MODE="0666" | ||
51 | KERNEL=="sonypi", MODE="0666" | ||
52 | KERNEL=="agpgart", GROUP="video" | ||
53 | KERNEL=="nvram", GROUP="nvram" | ||
54 | KERNEL=="rtc", MODE="0660", GROUP="audio" | ||
55 | |||
56 | KERNEL=="cdemu[0-9]*", GROUP="cdrom" | ||
57 | KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" | ||
58 | KERNEL=="pktcdvd", MODE="0644" | ||
59 | |||
60 | # printers and parallel devices | ||
61 | SUBSYSTEM=="printer", GROUP="lp" | ||
62 | SUBSYSTEM=="ppdev", GROUP="lp" | ||
63 | KERNEL=="pt[0-9]*", GROUP="tape" | ||
64 | KERNEL=="pht[0-9]*", GROUP="tape" | ||
65 | |||
66 | # sound devices | ||
67 | SUBSYSTEM=="sound", GROUP="audio" | ||
68 | |||
69 | # ieee1394 devices | ||
70 | KERNEL=="raw1394", GROUP="disk" | ||
71 | KERNEL=="dv1394*", GROUP="video" | ||
72 | KERNEL=="video1394*", GROUP="video" | ||
73 | |||
74 | # input devices | ||
75 | KERNEL=="event[0-9]*", MODE="0664" | ||
76 | KERNEL=="js[0-9]*", MODE="0664" | ||
77 | |||
78 | # AOE character devices | ||
79 | SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" | ||
80 | SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" | ||
81 | |||
diff --git a/openembedded/packages/udev/files/slugos/mount.blacklist b/openembedded/packages/udev/files/slugos/mount.blacklist deleted file mode 100644 index 210702f837..0000000000 --- a/openembedded/packages/udev/files/slugos/mount.blacklist +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | ram[0-9]$ | ||
2 | mtdblock[0-9]$ | ||
3 | hd[a-z]$ | ||
4 | sd[a-z]$ | ||
diff --git a/openembedded/packages/udev/files/spitz/mount.blacklist b/openembedded/packages/udev/files/spitz/mount.blacklist deleted file mode 100644 index 38c7aa4b32..0000000000 --- a/openembedded/packages/udev/files/spitz/mount.blacklist +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/hda | ||
6 | /dev/loop | ||
7 | /dev/ram \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/files/tmpfs.patch b/openembedded/packages/udev/files/tmpfs.patch deleted file mode 100644 index 9d0d8b4515..0000000000 --- a/openembedded/packages/udev/files/tmpfs.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- udev-031/extras/start_udev~tmpfs 2004-09-10 17:10:03.000000000 -0400 | ||
7 | +++ udev-031/extras/start_udev 2004-09-11 15:18:15.560789160 -0400 | ||
8 | @@ -85,7 +85,7 @@ | ||
9 | fi | ||
10 | |||
11 | echo "mounting... ramfs at $udev_root" | ||
12 | -mount -n -t ramfs none $udev_root | ||
13 | +mount -n -t ramfs none $udev_root || mount -n -t tmpfs none $udev_root | ||
14 | |||
15 | # propogate /udev from /sys | ||
16 | echo "Creating initial udev device nodes:" | ||
diff --git a/openembedded/packages/udev/files/tosa/mount.blacklist b/openembedded/packages/udev/files/tosa/mount.blacklist deleted file mode 100644 index 7e351bc988..0000000000 --- a/openembedded/packages/udev/files/tosa/mount.blacklist +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # This is a grep pattern matched against the device name | ||
2 | # Any matched pattern will _not_ be mounted / removed by udevd | ||
3 | |||
4 | /dev/mtdblock | ||
5 | /dev/loop | ||
6 | /dev/ram \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/files/udev.rules b/openembedded/packages/udev/files/udev.rules deleted file mode 100644 index 5c566f6cef..0000000000 --- a/openembedded/packages/udev/files/udev.rules +++ /dev/null | |||
@@ -1,98 +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+="/sbin/firmware_helper" | ||
diff --git a/openembedded/packages/udev/files/udev_network_queue.sh b/openembedded/packages/udev/files/udev_network_queue.sh deleted file mode 100644 index 05e08e9d1b..0000000000 --- a/openembedded/packages/udev/files/udev_network_queue.sh +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | # | ||
3 | # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 | ||
4 | # License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) | ||
5 | # | ||
6 | # Filename: udev_network_queue.sh | ||
7 | # Date: 03-May-06 | ||
8 | |||
9 | do_start() { | ||
10 | if test -e /dev/udev_network_queue | ||
11 | then | ||
12 | echo "Activating queued NICs..." | ||
13 | for NIC in `cat /dev/udev_network_queue` | ||
14 | do | ||
15 | export INTERFACE="$NIC" ; export ACTION=add | ||
16 | /etc/udev/scripts/network.sh | ||
17 | done | ||
18 | echo "" | ||
19 | else | ||
20 | echo "No NICs queued" | ||
21 | fi | ||
22 | } | ||
23 | |||
24 | do_stop() { | ||
25 | /bin/true | ||
26 | } | ||
27 | |||
28 | case "$1" in | ||
29 | start) do_start;; | ||
30 | stop) do_stop;; | ||
31 | restart) do_stop | ||
32 | do_start;; | ||
33 | *) echo "Usage: `basename $0` [ start | stop | restart ]" | ||
34 | exit 0;; | ||
35 | esac | ||
diff --git a/openembedded/packages/udev/files/udevsynthesize.patch b/openembedded/packages/udev/files/udevsynthesize.patch deleted file mode 100644 index 7811188485..0000000000 --- a/openembedded/packages/udev/files/udevsynthesize.patch +++ /dev/null | |||
@@ -1,776 +0,0 @@ | |||
1 | --- udev-081/udevsynthesize.c.orig 2006-01-29 12:22:45.000000000 +0100 | ||
2 | +++ udev-081/udevsynthesize.c 2006-01-29 12:22:40.000000000 +0100 | ||
3 | @@ -0,0 +1,763 @@ | ||
4 | +/* | ||
5 | + * udevcoldplug.c | ||
6 | + * | ||
7 | + * Copyright (C) 2005 SUSE Linux Products GmbH | ||
8 | + * | ||
9 | + * Author: | ||
10 | + * Kay Sievers <kay.sievers@vrfy.org> | ||
11 | + * | ||
12 | + * Synthesize kernel events from sysfs information and pass them | ||
13 | + * to the udevd daemon. | ||
14 | + * | ||
15 | + * This program is free software; you can redistribute it and/or modify it | ||
16 | + * under the terms of the GNU General Public License as published by the | ||
17 | + * Free Software Foundation version 2 of the License. | ||
18 | + * | ||
19 | + * This program is distributed in the hope that it will be useful, but | ||
20 | + * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
21 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
22 | + * General Public License for more details. | ||
23 | + * | ||
24 | + * You should have received a copy of the GNU General Public License along | ||
25 | + * with this program; if not, write to the Free Software Foundation, Inc., | ||
26 | + * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
27 | + * | ||
28 | + */ | ||
29 | + | ||
30 | +#include <stdlib.h> | ||
31 | +#include <stddef.h> | ||
32 | +#include <string.h> | ||
33 | +#include <stdio.h> | ||
34 | +#include <unistd.h> | ||
35 | +#include <errno.h> | ||
36 | +#include <ctype.h> | ||
37 | +#include <fcntl.h> | ||
38 | +#include <dirent.h> | ||
39 | +#include <signal.h> | ||
40 | +#include <syslog.h> | ||
41 | +#include <sys/socket.h> | ||
42 | +#include <sys/un.h> | ||
43 | +#include <sys/wait.h> | ||
44 | +#include <sys/stat.h> | ||
45 | +#include <sys/types.h> | ||
46 | + | ||
47 | +#include "udev_libc_wrapper.h" | ||
48 | +#include "udev.h" | ||
49 | +#include "udevd.h" | ||
50 | +#include "udev_version.h" | ||
51 | +#include "logging.h" | ||
52 | + | ||
53 | +#include "list.h" | ||
54 | + | ||
55 | +#ifndef DT_DIR | ||
56 | +#define DT_DIR 4 | ||
57 | +#endif | ||
58 | + | ||
59 | +static const char *udev_log_str; | ||
60 | +static int udevd_sock = -1; | ||
61 | + | ||
62 | +#ifdef USE_LOG | ||
63 | +void log_message(int priority, const char *format, ...) | ||
64 | +{ | ||
65 | + va_list args; | ||
66 | + | ||
67 | + if (priority > udev_log_priority) | ||
68 | + return; | ||
69 | + | ||
70 | + va_start(args, format); | ||
71 | + vsyslog(priority, format, args); | ||
72 | + va_end(args); | ||
73 | +} | ||
74 | +#endif | ||
75 | + | ||
76 | +struct device { | ||
77 | + struct list_head node; | ||
78 | + struct udevd_msg msg; | ||
79 | + size_t bufpos; | ||
80 | + char *path; | ||
81 | +}; | ||
82 | + | ||
83 | +static dev_t read_devt(const char *path) | ||
84 | +{ | ||
85 | + char filename[PATH_SIZE]; | ||
86 | + char majorminor[64]; | ||
87 | + unsigned int major, minor; | ||
88 | + ssize_t count; | ||
89 | + int fd; | ||
90 | + | ||
91 | + snprintf(filename, sizeof(filename), "%s/%s", path, "dev"); | ||
92 | + filename[sizeof(filename)-1] = '\0'; | ||
93 | + | ||
94 | + fd = open(filename, O_RDONLY); | ||
95 | + if (fd < 0) | ||
96 | + return 0; | ||
97 | + | ||
98 | + count = read(fd, majorminor, sizeof(majorminor)); | ||
99 | + close(fd); | ||
100 | + majorminor[count] = '\0'; | ||
101 | + if (sscanf(majorminor, "%u:%u", &major, &minor) != 2) | ||
102 | + return 0; | ||
103 | + dbg("found major=%d, minor=%d", major, minor); | ||
104 | + | ||
105 | + return makedev(major, minor); | ||
106 | +} | ||
107 | + | ||
108 | +static ssize_t read_file(const char *directory, const char *file, char *str, size_t len) | ||
109 | +{ | ||
110 | + char filename[PATH_SIZE]; | ||
111 | + ssize_t count; | ||
112 | + int fd; | ||
113 | + | ||
114 | + memset(filename, 0, sizeof(filename)); | ||
115 | + snprintf(filename, sizeof(filename), "%s/%s", directory, file); | ||
116 | + filename[sizeof(filename)-1] = '\0'; | ||
117 | + | ||
118 | + fd = open(filename, O_RDONLY); | ||
119 | + if (fd < 0) | ||
120 | + return -1; | ||
121 | + | ||
122 | + count = read(fd, str, len-1); | ||
123 | + close(fd); | ||
124 | + | ||
125 | + if (count > (ssize_t)len) | ||
126 | + count = len; | ||
127 | + str[count-1] = '\0'; | ||
128 | + | ||
129 | + return count; | ||
130 | +} | ||
131 | + | ||
132 | +static ssize_t read_link(const char *directory, const char *file, char *str, size_t size) | ||
133 | +{ | ||
134 | + char filename[PATH_SIZE]; | ||
135 | + char target[PATH_SIZE]; | ||
136 | + int len; | ||
137 | + char *back; | ||
138 | + char *strip; | ||
139 | + int level = 1; | ||
140 | + | ||
141 | + snprintf(filename, sizeof(filename), "%s/%s", directory, file); | ||
142 | + filename[sizeof(filename)-1] = '\0'; | ||
143 | + | ||
144 | + len = readlink(filename, target, sizeof(target)-1); | ||
145 | + if (len < 0) | ||
146 | + return -1; | ||
147 | + target[len] = '\0'; | ||
148 | + | ||
149 | + back = target; | ||
150 | + while (strncmp(back, "../", 3) == 0) { | ||
151 | + back += 3; | ||
152 | + level++; | ||
153 | + } | ||
154 | + while(level--) { | ||
155 | + strip = strrchr(filename, '/'); | ||
156 | + if (!strip) | ||
157 | + return -1; | ||
158 | + strip[0] = '\0'; | ||
159 | + } | ||
160 | + | ||
161 | + snprintf(str, size, "%s/%s", filename, back); | ||
162 | + str[size-1] = '\0'; | ||
163 | + | ||
164 | + return len; | ||
165 | +} | ||
166 | + | ||
167 | +static char *add_env_key(struct device *device, const char *key, const char *value) | ||
168 | +{ | ||
169 | + size_t pos = device->bufpos; | ||
170 | + device->bufpos += sprintf(&device->msg.envbuf[device->bufpos], "%s=%s", key, value)+1; | ||
171 | + return &device->msg.envbuf[pos]; | ||
172 | +} | ||
173 | + | ||
174 | +static struct device *device_create(const char *path, const char *subsystem, dev_t devt) | ||
175 | +{ | ||
176 | + struct device *device; | ||
177 | + const char *devpath = &path[strlen(sysfs_path)]; | ||
178 | + char target[PATH_SIZE]; | ||
179 | + | ||
180 | + device = malloc(sizeof(struct device)); | ||
181 | + if (device == NULL) { | ||
182 | + dbg("error malloc"); | ||
183 | + return NULL; | ||
184 | + } | ||
185 | + memset(device, 0x00, sizeof(struct device)); | ||
186 | + | ||
187 | + device->path = add_env_key(device, "DEVPATH", devpath); | ||
188 | + device->path += strlen("DEVPATH="); | ||
189 | + add_env_key(device, "SUBSYSTEM", subsystem); | ||
190 | + add_env_key(device, "ACTION", "add"); | ||
191 | + add_env_key(device, "UDEV_COLDPLUG", "1"); | ||
192 | + | ||
193 | + if (major(devt)) { | ||
194 | + char number[32]; | ||
195 | + sprintf(number, "%u", major(devt)); | ||
196 | + add_env_key(device, "MAJOR", number); | ||
197 | + sprintf(number, "%u", minor(devt)); | ||
198 | + add_env_key(device, "MINOR", number); | ||
199 | + } | ||
200 | + | ||
201 | + if (strncmp(devpath, "/block/", strlen("/block/")) == 0 || | ||
202 | + strncmp(devpath, "/class/", strlen("/class/")) == 0) { | ||
203 | + char physpath[PATH_SIZE]; | ||
204 | + | ||
205 | + if (read_link(path, "device", physpath, sizeof(physpath)) > (ssize_t)strlen(sysfs_path)) { | ||
206 | + add_env_key(device, "PHYSDEVPATH", &physpath[strlen(sysfs_path)]); | ||
207 | + if (read_link(physpath, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) { | ||
208 | + char *pos = strrchr(target, '/'); | ||
209 | + if (pos) | ||
210 | + add_env_key(device, "PHYSDEVDRIVER", &pos[1]); | ||
211 | + } | ||
212 | + if (read_link(physpath, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) { | ||
213 | + char *pos = strrchr(target, '/'); | ||
214 | + if (pos) | ||
215 | + add_env_key(device, "PHYSDEVBUS", &pos[1]); | ||
216 | + } | ||
217 | + } | ||
218 | + } else if (strncmp(devpath, "/devices/", strlen("/devices/")) == 0) { | ||
219 | + if (read_link(path, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) { | ||
220 | + char *pos = strrchr(target, '/'); | ||
221 | + if (pos) | ||
222 | + add_env_key(device, "PHYSDEVDRIVER", &pos[1]); | ||
223 | + } | ||
224 | + if (read_link(path, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) { | ||
225 | + char *pos = strrchr(target, '/'); | ||
226 | + if (pos) | ||
227 | + add_env_key(device, "PHYSDEVBUS", &pos[1]); | ||
228 | + } | ||
229 | + } | ||
230 | + | ||
231 | + return device; | ||
232 | +} | ||
233 | + | ||
234 | +static int device_list_insert(struct list_head *device_list, struct device *device) | ||
235 | +{ | ||
236 | + struct device *loop_device; | ||
237 | + | ||
238 | + dbg("insert: '%s'", device->path); | ||
239 | + | ||
240 | + /* sort files in lexical order */ | ||
241 | + list_for_each_entry(loop_device, device_list, node) | ||
242 | + if (strcmp(loop_device->path, device->path) > 0) | ||
243 | + break; | ||
244 | + | ||
245 | + list_add_tail(&device->node, &loop_device->node); | ||
246 | + | ||
247 | + return 0; | ||
248 | +} | ||
249 | + | ||
250 | +static int add_device_udevd(struct device *device) | ||
251 | +{ | ||
252 | + size_t msg_len; | ||
253 | + struct sockaddr_un saddr; | ||
254 | + socklen_t addrlen; | ||
255 | + int retval; | ||
256 | + | ||
257 | + memset(&saddr, 0x00, sizeof(struct sockaddr_un)); | ||
258 | + saddr.sun_family = AF_LOCAL; | ||
259 | + /* use abstract namespace for socket path */ | ||
260 | + strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH); | ||
261 | + addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1; | ||
262 | + | ||
263 | + strcpy(device->msg.magic, UDEV_MAGIC); | ||
264 | + device->msg.type = UDEVD_UEVENT_UDEVSEND; | ||
265 | + | ||
266 | + msg_len = offsetof(struct udevd_msg, envbuf) + device->bufpos; | ||
267 | + dbg("msg_len=%i", msg_len); | ||
268 | + | ||
269 | + retval = sendto(udevd_sock, &device->msg, msg_len, 0, (struct sockaddr *)&saddr, addrlen); | ||
270 | + if (retval < 0) | ||
271 | + return -1; | ||
272 | + | ||
273 | + return 0; | ||
274 | +} | ||
275 | + | ||
276 | +static void exec_list(struct list_head *device_list, const char *first[], const char *last[]) | ||
277 | +{ | ||
278 | + struct device *loop_device; | ||
279 | + struct device *tmp_device; | ||
280 | + int i; | ||
281 | + | ||
282 | + /* handle the "first" type devices first */ | ||
283 | + if (first) | ||
284 | + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { | ||
285 | + for (i = 0; first[i] != NULL; i++) { | ||
286 | + if (strncmp(loop_device->path, first[i], strlen(first[i])) == 0) { | ||
287 | + add_device_udevd(loop_device); | ||
288 | + list_del(&loop_device->node); | ||
289 | + free(loop_device); | ||
290 | + break; | ||
291 | + } | ||
292 | + } | ||
293 | + } | ||
294 | + | ||
295 | + /* handle the devices we are allowed to, excluding the "last" type devices */ | ||
296 | + if (last) | ||
297 | + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { | ||
298 | + int found = 0; | ||
299 | + for (i = 0; last[i] != NULL; i++) { | ||
300 | + if (strncmp(loop_device->path, last[i], strlen(last[i])) == 0) { | ||
301 | + found = 1; | ||
302 | + break; | ||
303 | + } | ||
304 | + } | ||
305 | + if (found) | ||
306 | + continue; | ||
307 | + | ||
308 | + add_device_udevd(loop_device); | ||
309 | + list_del(&loop_device->node); | ||
310 | + free(loop_device); | ||
311 | + } | ||
312 | + | ||
313 | + /* handle the rest of the devices */ | ||
314 | + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { | ||
315 | + add_device_udevd(loop_device); | ||
316 | + list_del(&loop_device->node); | ||
317 | + free(loop_device); | ||
318 | + } | ||
319 | +} | ||
320 | + | ||
321 | +static int udev_scan_class(void) | ||
322 | +{ | ||
323 | + char base[PATH_SIZE]; | ||
324 | + DIR *dir; | ||
325 | + struct dirent *dent; | ||
326 | + LIST_HEAD(device_list); | ||
327 | + | ||
328 | + /* we want /dev/null and /dev/console first */ | ||
329 | + const char *first[] = { | ||
330 | + "/class/mem", | ||
331 | + "/class/tty", | ||
332 | + NULL, | ||
333 | + }; | ||
334 | + | ||
335 | + snprintf(base, sizeof(base), "%s/class", sysfs_path); | ||
336 | + base[sizeof(base)-1] = '\0'; | ||
337 | + | ||
338 | + dir = opendir(base); | ||
339 | + if (!dir) | ||
340 | + return -1; | ||
341 | + | ||
342 | + for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { | ||
343 | + char dirname[PATH_SIZE]; | ||
344 | + DIR *dir2; | ||
345 | + struct dirent *dent2; | ||
346 | + | ||
347 | + if (dent->d_name[0] == '.') | ||
348 | + continue; | ||
349 | + | ||
350 | + snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); | ||
351 | + dirname[sizeof(dirname)-1] = '\0'; | ||
352 | + | ||
353 | + dir2 = opendir(dirname); | ||
354 | + if (!dir2) | ||
355 | + continue; | ||
356 | + for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { | ||
357 | + char dirname2[PATH_SIZE]; | ||
358 | + struct device *device; | ||
359 | + dev_t devt; | ||
360 | + | ||
361 | + if (dent2->d_name[0] == '.') | ||
362 | + continue; | ||
363 | + if (dent2->d_type != DT_DIR) | ||
364 | + continue; | ||
365 | + | ||
366 | + snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); | ||
367 | + dirname2[sizeof(dirname2)-1] = '\0'; | ||
368 | + devt = read_devt(dirname2); | ||
369 | + device = device_create(dirname2, dent->d_name, devt); | ||
370 | + | ||
371 | + if (strcmp(dent->d_name, "net") == 0 || | ||
372 | + strcmp(dent->d_name, "bluetooth") == 0) { | ||
373 | + add_env_key(device, "INTERFACE", dent2->d_name); | ||
374 | + } else if (strcmp(dent->d_name, "pcmcia_socket") == 0 && | ||
375 | + strlen(dent->d_name) > 14) { | ||
376 | + add_env_key(device, "SOCKET_NO", | ||
377 | + dent2->d_name + 14); | ||
378 | + } | ||
379 | + | ||
380 | + device_list_insert(&device_list, device); | ||
381 | + } | ||
382 | + closedir(dir2); | ||
383 | + } | ||
384 | + closedir(dir); | ||
385 | + exec_list(&device_list, first, NULL); | ||
386 | + | ||
387 | + return 0; | ||
388 | +} | ||
389 | + | ||
390 | +static int udev_scan_block(void) | ||
391 | +{ | ||
392 | + char base[PATH_SIZE]; | ||
393 | + DIR *dir; | ||
394 | + struct dirent *dent; | ||
395 | + LIST_HEAD(device_list); | ||
396 | + | ||
397 | + /* dm wants to have the block devices around before it */ | ||
398 | + const char *last[] = { | ||
399 | + "/block/dm", | ||
400 | + NULL, | ||
401 | + }; | ||
402 | + | ||
403 | + snprintf(base, sizeof(base), "%s/block", sysfs_path); | ||
404 | + base[sizeof(base)-1] = '\0'; | ||
405 | + | ||
406 | + dir = opendir(base); | ||
407 | + if (!dir) | ||
408 | + return -1; | ||
409 | + | ||
410 | + for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { | ||
411 | + char dirname[PATH_SIZE]; | ||
412 | + struct device *device; | ||
413 | + struct dirent *dent2; | ||
414 | + DIR *dir2; | ||
415 | + dev_t devt; | ||
416 | + | ||
417 | + if (dent->d_name[0] == '.') | ||
418 | + continue; | ||
419 | + if (dent->d_type != DT_DIR) | ||
420 | + continue; | ||
421 | + | ||
422 | + snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); | ||
423 | + dirname[sizeof(dirname)-1] = '\0'; | ||
424 | + devt = read_devt(dirname); | ||
425 | + if (major(devt)) { | ||
426 | + device = device_create(dirname, "block", devt); | ||
427 | + device_list_insert(&device_list, device); | ||
428 | + } | ||
429 | + | ||
430 | + /* look for partitions */ | ||
431 | + dir2 = opendir(dirname); | ||
432 | + if (!dir2) | ||
433 | + continue; | ||
434 | + for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { | ||
435 | + char dirname2[PATH_SIZE]; | ||
436 | + | ||
437 | + if (dent2->d_name[0] == '.') | ||
438 | + continue; | ||
439 | + if (dent2->d_type != DT_DIR) | ||
440 | + continue; | ||
441 | + | ||
442 | + snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); | ||
443 | + dirname2[sizeof(dirname2)-1] = '\0'; | ||
444 | + devt = read_devt(dirname2); | ||
445 | + if (major(devt)) { | ||
446 | + device = device_create(dirname2, "block", devt); | ||
447 | + device_list_insert(&device_list, device); | ||
448 | + continue; | ||
449 | + } | ||
450 | + } | ||
451 | + closedir(dir2); | ||
452 | + } | ||
453 | + closedir(dir); | ||
454 | + exec_list(&device_list, NULL, last); | ||
455 | + | ||
456 | + return 0; | ||
457 | +} | ||
458 | + | ||
459 | +static int pci_handler(struct device *device) | ||
460 | +{ | ||
461 | + char path[PATH_SIZE]; | ||
462 | + char value[PATH_SIZE]; | ||
463 | + char vendor[PATH_SIZE]; | ||
464 | + char product[PATH_SIZE]; | ||
465 | + const char *name; | ||
466 | + | ||
467 | + snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path); | ||
468 | + path[sizeof(path)-1] = '\0'; | ||
469 | + | ||
470 | + if (read_file(path, "modalias", value, sizeof(value)) > 0) | ||
471 | + add_env_key(device, "MODALIAS", value); | ||
472 | + | ||
473 | + name = strrchr(device->path, '/'); | ||
474 | + if (name) | ||
475 | + add_env_key(device, "PCI_SLOT_NAME", &name[1]); | ||
476 | + | ||
477 | + if (read_file(path, "class", value, sizeof(value)) > 0) | ||
478 | + add_env_key(device, "PCI_CLASS", &value[2]); | ||
479 | + | ||
480 | + if (read_file(path, "vendor", vendor, sizeof(vendor)) > 0 && | ||
481 | + read_file(path, "device", product, sizeof(product)) > 0) { | ||
482 | + snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]); | ||
483 | + path[sizeof(value)-1] = '\0'; | ||
484 | + add_env_key(device, "PCI_ID", value); | ||
485 | + } | ||
486 | + | ||
487 | + if (read_file(path, "subsystem_vendor", vendor, sizeof(vendor)) > 0 && | ||
488 | + read_file(path, "subsystem_device", product, sizeof(product)) > 0) { | ||
489 | + snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]); | ||
490 | + path[sizeof(value)-1] = '\0'; | ||
491 | + add_env_key(device, "PCI_SUBSYS_ID", value); | ||
492 | + } | ||
493 | + | ||
494 | + return 0; | ||
495 | +} | ||
496 | + | ||
497 | +static int usb_handler(struct device *device) | ||
498 | +{ | ||
499 | + char path[PATH_SIZE]; | ||
500 | + char value[PATH_SIZE]; | ||
501 | + char str1[PATH_SIZE]; | ||
502 | + char str2[PATH_SIZE]; | ||
503 | + char str3[PATH_SIZE]; | ||
504 | + unsigned int int1; | ||
505 | + unsigned int int2; | ||
506 | + unsigned int int3; | ||
507 | + char *pos; | ||
508 | + | ||
509 | + snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path); | ||
510 | + path[sizeof(path)-1] = '\0'; | ||
511 | + | ||
512 | + /* device events have : in their directory name */ | ||
513 | + pos = strrchr(path, '/'); | ||
514 | + if (!strchr(pos, ':')) | ||
515 | + return 0; /* and do not have other variables */ | ||
516 | + | ||
517 | + if (read_file(path, "modalias", value, sizeof(value)) > 0) | ||
518 | + add_env_key(device, "MODALIAS", value); | ||
519 | + | ||
520 | + if (read_file(path, "bInterfaceClass", str1, sizeof(str1)) > 0 && | ||
521 | + read_file(path, "bInterfaceSubClass", str2, sizeof(str2)) > 0 && | ||
522 | + read_file(path, "bInterfaceProtocol", str3, sizeof(str3)) > 0) { | ||
523 | + int1 = (int) strtol(str1, NULL, 16); | ||
524 | + int2 = (int) strtol(str2, NULL, 16); | ||
525 | + int3 = (int) strtol(str3, NULL, 16); | ||
526 | + snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3); | ||
527 | + path[sizeof(value)-1] = '\0'; | ||
528 | + add_env_key(device, "INTERFACE", value); | ||
529 | + } | ||
530 | + | ||
531 | + /* move to the parent directory */ | ||
532 | + pos[0] = '\0'; | ||
533 | + | ||
534 | + if (read_file(path, "idVendor", str1, sizeof(str1)) > 0 && | ||
535 | + read_file(path, "idProduct", str2, sizeof(str2)) > 0 && | ||
536 | + read_file(path, "bcdDevice", str3, sizeof(str3)) > 0) { | ||
537 | + int1 = (int) strtol(str1, NULL, 16); | ||
538 | + int2 = (int) strtol(str2, NULL, 16); | ||
539 | + int3 = (int) strtol(str3, NULL, 16); | ||
540 | + snprintf(value, sizeof(value), "%x/%x/%x", int1, int2, int3); | ||
541 | + path[sizeof(value)-1] = '\0'; | ||
542 | + add_env_key(device, "PRODUCT", value); | ||
543 | + } | ||
544 | + | ||
545 | + if (read_file(path, "bDeviceClass", str1, sizeof(str1)) > 0 && | ||
546 | + read_file(path, "bDeviceSubClass", str2, sizeof(str2)) > 0 && | ||
547 | + read_file(path, "bDeviceProtocol", str3, sizeof(str3)) > 0) { | ||
548 | + int1 = (int) strtol(str1, NULL, 16); | ||
549 | + int2 = (int) strtol(str2, NULL, 16); | ||
550 | + int3 = (int) strtol(str3, NULL, 16); | ||
551 | + snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3); | ||
552 | + path[sizeof(value)-1] = '\0'; | ||
553 | + add_env_key(device, "TYPE", value); | ||
554 | + } | ||
555 | + | ||
556 | + if (read_file(path, "devnum", str2, sizeof(str2)) > 0) { | ||
557 | + pos = strrchr(path, 'b'); | ||
558 | + int1 = (int) strtol(pos + 1, NULL, 16); | ||
559 | + int2 = (int) strtol(str2, NULL, 16); | ||
560 | + snprintf(value, sizeof(value), | ||
561 | + "/proc/bus/usb/%03d/%03d", int1, int2); | ||
562 | + path[sizeof(value)-1] = '\0'; | ||
563 | + add_env_key(device, "DEVICE", value); | ||
564 | + } | ||
565 | + | ||
566 | + return 0; | ||
567 | +} | ||
568 | + | ||
569 | +static int serio_handler(struct device *device) | ||
570 | +{ | ||
571 | + char path[PATH_SIZE]; | ||
572 | + char value[PATH_SIZE]; | ||
573 | + | ||
574 | + snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path); | ||
575 | + path[sizeof(path)-1] = '\0'; | ||
576 | + | ||
577 | + if (read_file(path, "modalias", value, sizeof(value)) > 0) | ||
578 | + add_env_key(device, "MODALIAS", value); | ||
579 | + | ||
580 | + if (read_file(path, "id/type", value, sizeof(value)) > 0) | ||
581 | + add_env_key(device, "SERIO_TYPE", value); | ||
582 | + | ||
583 | + if (read_file(path, "id/proto", value, sizeof(value)) > 0) | ||
584 | + add_env_key(device, "SERIO_PROTO", value); | ||
585 | + | ||
586 | + if (read_file(path, "id/id", value, sizeof(value)) > 0) | ||
587 | + add_env_key(device, "SERIO_ID", value); | ||
588 | + | ||
589 | + if (read_file(path, "id/extra", value, sizeof(value)) > 0) | ||
590 | + add_env_key(device, "SERIO_EXTRA", value); | ||
591 | + | ||
592 | + return 0; | ||
593 | +} | ||
594 | + | ||
595 | +static int ccw_handler(struct device *device) | ||
596 | +{ | ||
597 | + char path[PATH_SIZE]; | ||
598 | + char value[PATH_SIZE], *tmp; | ||
599 | + | ||
600 | + snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path); | ||
601 | + path[sizeof(path)-1] = '\0'; | ||
602 | + | ||
603 | + if (read_file(path, "modalias", value, sizeof(value)) > 0) | ||
604 | + add_env_key(device, "MODALIAS", value); | ||
605 | + | ||
606 | + if (read_file(path, "cutype", value, sizeof(value)) > 0) { | ||
607 | + value[4] = 0; | ||
608 | + tmp = &value[5]; | ||
609 | + add_env_key(device, "CU_TYPE", value); | ||
610 | + add_env_key(device, "CU_MODEL", tmp); | ||
611 | + } | ||
612 | + | ||
613 | + if (read_file(path, "devtype", value, sizeof(value)) > 0) { | ||
614 | + if (value[0] == 'n') { | ||
615 | + add_env_key(device, "DEV_TYPE", "0000"); | ||
616 | + add_env_key(device, "DEV_MODEL", "00"); | ||
617 | + } | ||
618 | + else { | ||
619 | + value[4] = 0; | ||
620 | + tmp = &value[5]; | ||
621 | + add_env_key(device, "DEV_TYPE", value); | ||
622 | + add_env_key(device, "DEV_MODEL", tmp); | ||
623 | + } | ||
624 | + } | ||
625 | + | ||
626 | + return 0; | ||
627 | +} | ||
628 | + | ||
629 | +static int modalias_handler(struct device *device) | ||
630 | +{ | ||
631 | + char path[PATH_SIZE]; | ||
632 | + char value[PATH_SIZE]; | ||
633 | + | ||
634 | + snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path); | ||
635 | + path[sizeof(path)-1] = '\0'; | ||
636 | + | ||
637 | + if (read_file(path, "modalias", value, sizeof(value)) > 0) | ||
638 | + add_env_key(device, "MODALIAS", value); | ||
639 | + | ||
640 | + return 0; | ||
641 | +} | ||
642 | + | ||
643 | +static int udev_scan_bus(const char *bus, int bus_handler(struct device *device)) | ||
644 | +{ | ||
645 | + char base[PATH_SIZE]; | ||
646 | + DIR *dir; | ||
647 | + struct dirent *dent; | ||
648 | + LIST_HEAD(device_list); | ||
649 | + | ||
650 | + snprintf(base, sizeof(base), "%s/bus/%s/devices", sysfs_path, bus); | ||
651 | + base[sizeof(base)-1] = '\0'; | ||
652 | + | ||
653 | + dir = opendir(base); | ||
654 | + if (!dir) | ||
655 | + return -1; | ||
656 | + for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { | ||
657 | + char devpath[PATH_SIZE]; | ||
658 | + struct device *device; | ||
659 | + | ||
660 | + if (dent->d_name[0] == '.') | ||
661 | + continue; | ||
662 | + | ||
663 | + if (read_link(base, dent->d_name, devpath, sizeof(devpath)) < 0) | ||
664 | + continue; | ||
665 | + | ||
666 | + device = device_create(devpath, bus, makedev(0, 0)); | ||
667 | + if (bus_handler) { | ||
668 | + if (bus_handler(device) < 0) { | ||
669 | + dbg("'%s' bus handler skipped event", devpath); | ||
670 | + free(device); | ||
671 | + continue; | ||
672 | + } | ||
673 | + } | ||
674 | + | ||
675 | + device_list_insert(&device_list, device); | ||
676 | + } | ||
677 | + closedir(dir); | ||
678 | + exec_list(&device_list, NULL, NULL); | ||
679 | + | ||
680 | + return 0; | ||
681 | +} | ||
682 | + | ||
683 | +static int udev_scan_devices(void) | ||
684 | +{ | ||
685 | + char base[PATH_SIZE]; | ||
686 | + DIR *dir; | ||
687 | + struct dirent *dent; | ||
688 | + | ||
689 | + snprintf(base, sizeof(base), "%s/bus", sysfs_path); | ||
690 | + base[sizeof(base)-1] = '\0'; | ||
691 | + | ||
692 | + dir = opendir(base); | ||
693 | + if (!dir) | ||
694 | + return -1; | ||
695 | + | ||
696 | + for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { | ||
697 | + if (dent->d_name[0] == '.') | ||
698 | + continue; | ||
699 | + if (dent->d_type != DT_DIR) | ||
700 | + continue; | ||
701 | + | ||
702 | + /* add bus specific env values */ | ||
703 | + if (strcmp(dent->d_name, "pci") == 0) | ||
704 | + udev_scan_bus("pci", pci_handler); | ||
705 | + else if (strcmp(dent->d_name, "usb") == 0) | ||
706 | + udev_scan_bus("usb", usb_handler); | ||
707 | + else if (strcmp(dent->d_name, "serio") == 0) | ||
708 | + udev_scan_bus("serio", serio_handler); | ||
709 | + else if (strcmp(dent->d_name, "ccw") == 0) | ||
710 | + udev_scan_bus("ccw", ccw_handler); | ||
711 | + else | ||
712 | + udev_scan_bus(dent->d_name, modalias_handler); | ||
713 | + } | ||
714 | + closedir(dir); | ||
715 | + | ||
716 | + return 0; | ||
717 | +} | ||
718 | + | ||
719 | +int main(int argc, char *argv[], char *envp[]) | ||
720 | +{ | ||
721 | + LIST_HEAD(device_list); | ||
722 | + int i; | ||
723 | + | ||
724 | + logging_init("udevcoldplug"); | ||
725 | + udev_config_init(); sysfs_init(); | ||
726 | + dbg("version %s", UDEV_VERSION); | ||
727 | + | ||
728 | + udev_log_str = getenv("UDEV_LOG"); | ||
729 | + | ||
730 | + /* disable all logging if not explicitely requested */ | ||
731 | + if (udev_log_str == NULL) | ||
732 | + udev_log_priority = 0; | ||
733 | + | ||
734 | + for (i = 1 ; i < argc; i++) { | ||
735 | + char *arg = argv[i]; | ||
736 | + | ||
737 | + if (strcmp(arg, "help") == 0 || strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { | ||
738 | + printf("Usage: udevcoldplug \n" | ||
739 | + " --help print this help text\n\n"); | ||
740 | + exit(0); | ||
741 | + } else { | ||
742 | + fprintf(stderr, "unknown option\n\n"); | ||
743 | + exit(1); | ||
744 | + } | ||
745 | + } | ||
746 | + | ||
747 | + udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0); | ||
748 | + if (udevd_sock < 0) { | ||
749 | + err("error getting socket"); | ||
750 | + return 1; | ||
751 | + } | ||
752 | + | ||
753 | + /* create nodes for already available devices */ | ||
754 | + udev_scan_class(); | ||
755 | + udev_scan_block(); | ||
756 | + | ||
757 | + /* synthesize events for bus devices | ||
758 | + * may load modules or configure the device */ | ||
759 | + udev_scan_devices(); | ||
760 | + | ||
761 | + if (udevd_sock >= 0) | ||
762 | + close(udevd_sock); | ||
763 | + logging_close(); | ||
764 | + | ||
765 | + return 0; | ||
766 | +} | ||
767 | --- udev-081/Makefile | ||
768 | +++ udev-081/Makefile | ||
769 | @@ -58,6 +58,7 @@ PROGRAMS = \ | ||
770 | udevmonitor \ | ||
771 | udevinfo \ | ||
772 | udevtest \ | ||
773 | + udevsynthesize \ | ||
774 | udevstart | ||
775 | |||
776 | HEADERS = \ | ||
diff --git a/openembedded/packages/udev/files/udevsynthesize.sh b/openembedded/packages/udev/files/udevsynthesize.sh deleted file mode 100644 index d58217c144..0000000000 --- a/openembedded/packages/udev/files/udevsynthesize.sh +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | |||
3 | load_input_modules() { | ||
4 | for module in mousedev evdev joydev; do | ||
5 | modprobe -q $module || true | ||
6 | done | ||
7 | } | ||
8 | |||
9 | if [ ! -e /sys/class/mem/null/uevent ]; then # <= 2.6.14 | ||
10 | /lib/udev/udevsynthesize | ||
11 | load_input_modules | ||
12 | exit 0 | ||
13 | fi | ||
14 | |||
15 | # replace $IFS with something which is not likely to appear in a sysfs path, | ||
16 | # because some buggy drivers have spaces in their names | ||
17 | oldifs="$IFS" | ||
18 | IFS="|" | ||
19 | |||
20 | for file in /sys/bus/*/devices/*/uevent /sys/class/*/*/uevent \ | ||
21 | /sys/block/*/uevent /sys/block/*/*/uevent; do | ||
22 | case "$file" in | ||
23 | */device/uevent) ;; # skip followed device symlinks | ||
24 | */\*/*) ;; | ||
25 | |||
26 | */class/mem/*) # for /dev/null | ||
27 | first="$first${IFS}$file" ;; | ||
28 | |||
29 | */block/md[0-9]*) | ||
30 | last="$last${IFS}$file" ;; | ||
31 | |||
32 | *) | ||
33 | default="$default${IFS}$file" ;; | ||
34 | esac | ||
35 | done | ||
36 | |||
37 | for file in $first${IFS}$default${IFS}$last; do | ||
38 | [ "$file" ] || continue | ||
39 | echo 'add' > "$file" || true | ||
40 | done | ||
41 | |||
42 | IFS="$oldifs" | ||
43 | |||
44 | case "$(uname -r)" in | ||
45 | 2.6.1[0-5]|2.6.1[0-5][!0-9]*) # <= 2.6.15 | ||
46 | load_input_modules | ||
47 | ;; | ||
48 | esac | ||
49 | |||
50 | exit 0 | ||
51 | |||
diff --git a/openembedded/packages/udev/udev-084/flags.patch b/openembedded/packages/udev/udev-084/flags.patch deleted file mode 100644 index f144a5f622..0000000000 --- a/openembedded/packages/udev/udev-084/flags.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | --- udev-081/Makefile.orig 2006-01-29 12:36:33.000000000 +0100 | ||
2 | +++ udev-081/Makefile 2006-01-29 12:36:58.000000000 +0100 | ||
3 | @@ -123,29 +123,29 @@ | ||
4 | STRIP = $(CROSS)strip | ||
5 | STRIPCMD = $(STRIP) -s | ||
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 | STRIPCMD = | ||
31 | endif | ||
32 | |||
33 | ifeq ($(strip $(USE_GCOV)),true) | ||
34 | - CFLAGS += -fprofile-arcs -ftest-coverage | ||
35 | + override CFLAGS += -fprofile-arcs -ftest-coverage | ||
36 | LDFLAGS += -fprofile-arcs | ||
37 | endif | ||
38 | |||
39 | @@ -160,11 +160,11 @@ | ||
40 | ifeq ($(strip $(USE_SELINUX)),true) | ||
41 | UDEV_OBJS += udev_selinux.o | ||
42 | LIB_OBJS += -lselinux -lsepol | ||
43 | - CFLAGS += -DUSE_SELINUX | ||
44 | + override CFLAGS += -DUSE_SELINUX | ||
45 | endif | ||
46 | |||
47 | ifeq ($(strip $(USE_STATIC)),true) | ||
48 | - CFLAGS += -DUSE_STATIC | ||
49 | + override CFLAGS += -DUSE_STATIC | ||
50 | LDFLAGS += -static | ||
51 | endif | ||
52 | |||
diff --git a/openembedded/packages/udev/udev-084/init b/openembedded/packages/udev/udev-084/init deleted file mode 100644 index 5a60d52a9a..0000000000 --- a/openembedded/packages/udev/udev-084/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/openembedded/packages/udev/udev-084/local.rules b/openembedded/packages/udev/udev-084/local.rules deleted file mode 100644 index bb8459ba23..0000000000 --- a/openembedded/packages/udev/udev-084/local.rules +++ /dev/null | |||
@@ -1,28 +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/*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" | ||
diff --git a/openembedded/packages/udev/udev-084/udev.rules b/openembedded/packages/udev/udev-084/udev.rules deleted file mode 100644 index 3ac51b301a..0000000000 --- a/openembedded/packages/udev/udev-084/udev.rules +++ /dev/null | |||
@@ -1,99 +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 | SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" | ||
19 | |||
20 | # USB devices | ||
21 | BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" | ||
22 | BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" | ||
23 | BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" | ||
24 | BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" | ||
25 | BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" | ||
26 | BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" | ||
27 | BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ | ||
28 | SYMLINK+="pilot" | ||
29 | |||
30 | # usbfs-like devices | ||
31 | SUBSYSTEM=="usb_device", \ | ||
32 | PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" | ||
33 | |||
34 | # serial devices | ||
35 | KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" | ||
36 | KERNEL=="capi[0-9]*", NAME="capi/%n" | ||
37 | |||
38 | # video devices | ||
39 | KERNEL=="card[0-9]*", NAME="dri/%k" | ||
40 | |||
41 | # misc devices | ||
42 | KERNEL=="hw_random", NAME="hwrng" | ||
43 | KERNEL=="tun", NAME="net/%k" | ||
44 | |||
45 | KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" | ||
46 | KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" | ||
47 | KERNEL=="pktcdvd", NAME="pktcdvd/control" | ||
48 | |||
49 | KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" | ||
50 | KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" | ||
51 | KERNEL=="microcode", NAME="cpu/microcode" | ||
52 | |||
53 | KERNEL=="umad*", NAME="infiniband/%k" | ||
54 | KERNEL=="issm*", NAME="infiniband/%k" | ||
55 | KERNEL=="uverbs*", NAME="infiniband/%k" | ||
56 | KERNEL=="ucm", NAME="infiniband/%k" | ||
57 | |||
58 | KERNEL=="buzzer", NAME="misc/buzzer" | ||
59 | |||
60 | # ALSA devices | ||
61 | KERNEL=="controlC[0-9]*", NAME="snd/%k" | ||
62 | KERNEL=="hwC[D0-9]*", NAME="snd/%k" | ||
63 | KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" | ||
64 | KERNEL=="midiC[D0-9]*", NAME="snd/%k" | ||
65 | KERNEL=="timer", NAME="snd/%k" | ||
66 | KERNEL=="seq", NAME="snd/%k" | ||
67 | |||
68 | # ieee1394 devices | ||
69 | KERNEL=="dv1394*", NAME="dv1394/%n" | ||
70 | KERNEL=="video1394*", NAME="video1394/%n" | ||
71 | |||
72 | # input devices | ||
73 | KERNEL=="mice", NAME="input/%k" | ||
74 | KERNEL=="mouse[0-9]*", NAME="input/%k" | ||
75 | KERNEL=="event[0-9]*", NAME="input/%k" | ||
76 | KERNEL=="js[0-9]*", NAME="input/%k" | ||
77 | KERNEL=="ts[0-9]*", NAME="input/%k" | ||
78 | KERNEL=="uinput", NAME="input/%k" | ||
79 | |||
80 | # Zaptel | ||
81 | KERNEL=="zapctl", NAME="zap/ctl" | ||
82 | KERNEL=="zaptimer", NAME="zap/timer" | ||
83 | KERNEL=="zapchannel", NAME="zap/channel" | ||
84 | KERNEL=="zappseudo", NAME="zap/pseudo" | ||
85 | KERNEL=="zap[0-9]*", NAME="zap/%n" | ||
86 | |||
87 | # AOE character devices | ||
88 | SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" | ||
89 | SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" | ||
90 | SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" | ||
91 | |||
92 | # device mapper creates its own device nodes, so ignore these | ||
93 | KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" | ||
94 | KERNEL=="device-mapper", NAME="mapper/control" | ||
95 | |||
96 | KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" | ||
97 | |||
98 | # Firmware Helper | ||
99 | ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" | ||
diff --git a/openembedded/packages/udev/udev-089/flags.patch b/openembedded/packages/udev/udev-089/flags.patch deleted file mode 100644 index 492a39881c..0000000000 --- a/openembedded/packages/udev/udev-089/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/openembedded/packages/udev/udev-089/init b/openembedded/packages/udev/udev-089/init deleted file mode 100644 index 5a60d52a9a..0000000000 --- a/openembedded/packages/udev/udev-089/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/openembedded/packages/udev/udev-089/local.rules b/openembedded/packages/udev/udev-089/local.rules deleted file mode 100644 index bb8459ba23..0000000000 --- a/openembedded/packages/udev/udev-089/local.rules +++ /dev/null | |||
@@ -1,28 +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/*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" | ||
diff --git a/openembedded/packages/udev/udev-089/udev.rules b/openembedded/packages/udev/udev-089/udev.rules deleted file mode 100644 index 7b4152c5bf..0000000000 --- a/openembedded/packages/udev/udev-089/udev.rules +++ /dev/null | |||
@@ -1,98 +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" | ||
diff --git a/openembedded/packages/udev/udev-092/flags.patch b/openembedded/packages/udev/udev-092/flags.patch deleted file mode 100644 index 492a39881c..0000000000 --- a/openembedded/packages/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/openembedded/packages/udev/udev-092/init b/openembedded/packages/udev/udev-092/init deleted file mode 100644 index 5a60d52a9a..0000000000 --- a/openembedded/packages/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/openembedded/packages/udev/udev-092/local.rules b/openembedded/packages/udev/udev-092/local.rules deleted file mode 100644 index 661922dda3..0000000000 --- a/openembedded/packages/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,1*,3,*k*14A,*a0,1,*18,*", SYMLINK+="input/touchscreen0" \ No newline at end of file | ||
diff --git a/openembedded/packages/udev/udev-092/permissions.rules b/openembedded/packages/udev/udev-092/permissions.rules deleted file mode 100644 index 8da35c3090..0000000000 --- a/openembedded/packages/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/openembedded/packages/udev/udev-092/udev.rules b/openembedded/packages/udev/udev-092/udev.rules deleted file mode 100644 index 9c4ea4214d..0000000000 --- a/openembedded/packages/udev/udev-092/udev.rules +++ /dev/null | |||
@@ -1,98 +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" | ||
diff --git a/openembedded/packages/udev/udev.inc b/openembedded/packages/udev/udev.inc deleted file mode 100644 index a3896a6978..0000000000 --- a/openembedded/packages/udev/udev.inc +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ | ||
2 | /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." | ||
3 | LICENSE = "GPL" | ||
4 | |||
5 | SRC_URI += " \ | ||
6 | file://udev.rules \ | ||
7 | file://devfs-udev.rules \ | ||
8 | file://links.conf \ | ||
9 | file://permissions.rules \ | ||
10 | file://mount.sh \ | ||
11 | file://network.sh \ | ||
12 | file://local.rules \ | ||
13 | file://init" | ||
14 | |||
15 | UDEV_DEVFS_RULES ?= "0" | ||
16 | |||
17 | PACKAGES =+ "udev-utils" | ||
18 | FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" | ||
19 | |||
20 | inherit update-rc.d | ||
21 | |||
22 | INITSCRIPT_NAME = "udev" | ||
23 | INITSCRIPT_PARAMS = "start 04 S ." | ||
24 | |||
25 | export CROSS = "${TARGET_PREFIX}" | ||
26 | export HOSTCC = "${BUILD_CC}" | ||
27 | export udevdir ?= "/dev" | ||
28 | export usrbindir := "${bindir}" | ||
29 | export usrsbindir := "${sbindir}" | ||
30 | export etcdir = "${sysconfdir}" | ||
31 | LD = "${CC}" | ||
32 | bindir = "/bin" | ||
33 | sbindir = "/sbin" | ||
34 | |||
35 | UDEV_EXTRAS = "<override me>" | ||
36 | FILES_${PN} += "${usrbindir} ${usrsbindir}" | ||
37 | EXTRA_OEMAKE = "-e \ | ||
38 | 'EXTRAS=${UDEV_EXTRAS}' \ | ||
39 | 'STRIP=echo'" | ||
40 | |||
41 | do_install () { | ||
42 | install -d ${D}${usrsbindir} \ | ||
43 | ${D}${sbindir} | ||
44 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
45 | install -d ${D}${sysconfdir}/init.d | ||
46 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
47 | |||
48 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
49 | |||
50 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
51 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
52 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
53 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
54 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
55 | fi | ||
56 | |||
57 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
58 | |||
59 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
60 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
61 | } | ||
diff --git a/openembedded/packages/udev/udev_084.bb b/openembedded/packages/udev/udev_084.bb deleted file mode 100644 index 71c8e048ff..0000000000 --- a/openembedded/packages/udev/udev_084.bb +++ /dev/null | |||
@@ -1,60 +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 = "hotplug" | ||
5 | |||
6 | SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | ||
7 | file://noasmlinkage.patch;patch=1 \ | ||
8 | file://flags.patch;patch=1 \ | ||
9 | file://udevsynthesize.patch;patch=1 \ | ||
10 | file://udevsynthesize.sh \ | ||
11 | file://mount.blacklist \ | ||
12 | file://udev_network_queue.sh" | ||
13 | |||
14 | include udev.inc | ||
15 | |||
16 | INITSCRIPT_PARAMS = "start 03 S ." | ||
17 | |||
18 | PR = "r13" | ||
19 | |||
20 | FILES_${PN} += "${base_libdir}" | ||
21 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" | ||
22 | EXTRA_OEMAKE += "libudevdir=/lib/udev" | ||
23 | |||
24 | do_install () { | ||
25 | install -d ${D}${usrsbindir} \ | ||
26 | ${D}${sbindir} | ||
27 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
28 | install -d ${D}${sysconfdir}/init.d | ||
29 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
30 | install -m 0755 ${WORKDIR}/udev_network_queue.sh ${D}${sysconfdir}/init.d/ | ||
31 | |||
32 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
33 | |||
34 | install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ | ||
35 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
36 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
37 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
38 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
39 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
40 | fi | ||
41 | |||
42 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
43 | |||
44 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
45 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
46 | |||
47 | install -d ${D}${base_libdir}/udev/ | ||
48 | install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize | ||
49 | install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize | ||
50 | } | ||
51 | |||
52 | |||
53 | pkg_postinst_append() { | ||
54 | update-rc.d -s udev_network_queue.sh start 41 S . start 55 0 6 . | ||
55 | } | ||
56 | |||
57 | |||
58 | pkg_postrm_append() { | ||
59 | update-rc.d -f udev_network_queue.sh remove | ||
60 | } | ||
diff --git a/openembedded/packages/udev/udev_089.bb b/openembedded/packages/udev/udev_089.bb deleted file mode 100644 index 3ab31addee..0000000000 --- a/openembedded/packages/udev/udev_089.bb +++ /dev/null | |||
@@ -1,49 +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 = "hotplug" | ||
5 | |||
6 | PR = "r2" | ||
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://mount.blacklist" | ||
14 | |||
15 | include udev.inc | ||
16 | |||
17 | INITSCRIPT_PARAMS = "start 03 S ." | ||
18 | |||
19 | FILES_${PN} += "${base_libdir}" | ||
20 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" | ||
21 | EXTRA_OEMAKE += "libudevdir=/lib/udev" | ||
22 | |||
23 | do_install () { | ||
24 | install -d ${D}${usrsbindir} \ | ||
25 | ${D}${sbindir} | ||
26 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
27 | install -d ${D}${sysconfdir}/init.d | ||
28 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
29 | |||
30 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
31 | |||
32 | install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ | ||
33 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
34 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
35 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
36 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
37 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
38 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
39 | fi | ||
40 | |||
41 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
42 | |||
43 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
44 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
45 | |||
46 | install -d ${D}${base_libdir}/udev/ | ||
47 | install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize | ||
48 | install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize | ||
49 | } | ||
diff --git a/openembedded/packages/udev/udev_092.bb b/openembedded/packages/udev/udev_092.bb deleted file mode 100644 index f25eeb0946..0000000000 --- a/openembedded/packages/udev/udev_092.bb +++ /dev/null | |||
@@ -1,49 +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 = "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://udevsynthesize.patch;patch=1 \ | ||
12 | file://udevsynthesize.sh \ | ||
13 | file://mount.blacklist" | ||
14 | |||
15 | include udev.inc | ||
16 | |||
17 | INITSCRIPT_PARAMS = "start 03 S ." | ||
18 | |||
19 | FILES_${PN} += "${base_libdir}" | ||
20 | UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" | ||
21 | EXTRA_OEMAKE += "libudevdir=/lib/udev" | ||
22 | |||
23 | do_install () { | ||
24 | install -d ${D}${usrsbindir} \ | ||
25 | ${D}${sbindir} | ||
26 | oe_runmake 'DESTDIR=${D}' INSTALL=install install | ||
27 | install -d ${D}${sysconfdir}/init.d | ||
28 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | ||
29 | |||
30 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
31 | |||
32 | install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ | ||
33 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | ||
34 | install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules | ||
35 | install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules | ||
36 | install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf | ||
37 | if [ "${UDEV_DEVFS_RULES}" = "1" ]; then | ||
38 | install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules | ||
39 | fi | ||
40 | |||
41 | install -d ${D}${sysconfdir}/udev/scripts/ | ||
42 | |||
43 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | ||
44 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | ||
45 | |||
46 | install -d ${D}${base_libdir}/udev/ | ||
47 | install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize | ||
48 | install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize | ||
49 | } | ||