diff options
Diffstat (limited to 'meta/recipes-core/udev/udev')
5 files changed, 43 insertions, 89 deletions
diff --git a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch new file mode 100644 index 0000000000..41deafa918 --- /dev/null +++ b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 0f8290c943da298abd269ca60fd8375dfb219971 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexandru DAMIAN <alexandru.damian@intel.com> | ||
3 | Date: Thu, 12 Jul 2012 12:54:48 +0300 | ||
4 | Subject: [PATCH] Fixing keyboard_force_release.sh shell script path | ||
5 | |||
6 | With the introduction of rootprefix, the keyboard-force-release.sh.in | ||
7 | was modified to be executed with @rootprefix@/bin/sh, which is wrong | ||
8 | because @rootprefix@ defaults to /usr (which is correct), but the | ||
9 | shell is always at /bin/sh (IEEE Std 1003.2-1992). | ||
10 | |||
11 | Therefore the interpreter for shell scripts needs to be /bin/sh at all times. | ||
12 | |||
13 | The upstream moved to configurable root prefix, this patch taclkes a | ||
14 | transition bug, and will not be applied upstream. | ||
15 | |||
16 | Upstream-Status: Inappropriate [legacy version] | ||
17 | |||
18 | Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> | ||
19 | --- | ||
20 | src/keymap/keyboard-force-release.sh.in | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/src/keymap/keyboard-force-release.sh.in b/src/keymap/keyboard-force-release.sh.in | ||
24 | index dd040ce..597a3a6 100755 | ||
25 | --- a/src/keymap/keyboard-force-release.sh.in | ||
26 | +++ b/src/keymap/keyboard-force-release.sh.in | ||
27 | @@ -1,4 +1,4 @@ | ||
28 | -#!@rootprefix@/bin/sh -e | ||
29 | +#!/bin/sh -e | ||
30 | # read list of scancodes, convert hex to decimal and | ||
31 | # append to the atkbd force_release sysfs attribute | ||
32 | # $1 sysfs devpath for serioX | ||
33 | -- | ||
34 | 1.7.9.5 | ||
35 | |||
diff --git a/meta/recipes-core/udev/udev/include_resource.patch b/meta/recipes-core/udev/udev/include_resource.patch deleted file mode 100644 index a46ce594d0..0000000000 --- a/meta/recipes-core/udev/udev/include_resource.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Fixes errors like below with eglibc 2.16 | ||
2 | |||
3 | libudev/libudev-util-private.c:348:16: error: 'PRIO_PROCESS' undeclared (first use in this function) | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: udev-164/libudev/libudev-util-private.c | ||
9 | =================================================================== | ||
10 | --- udev-164.orig/libudev/libudev-util-private.c 2010-08-03 02:42:26.000000000 -0700 | ||
11 | +++ udev-164/libudev/libudev-util-private.c 2012-07-03 10:53:35.082346684 -0700 | ||
12 | @@ -21,6 +21,7 @@ | ||
13 | #include <grp.h> | ||
14 | #include <sys/wait.h> | ||
15 | #include <sys/param.h> | ||
16 | +#include <sys/resource.h> | ||
17 | |||
18 | #include "libudev.h" | ||
19 | #include "libudev-private.h" | ||
20 | Index: udev-164/udev/udevd.c | ||
21 | =================================================================== | ||
22 | --- udev-164.orig/udev/udevd.c 2010-10-13 04:08:29.000000000 -0700 | ||
23 | +++ udev-164/udev/udevd.c 2012-07-03 10:53:19.214345914 -0700 | ||
24 | @@ -43,6 +43,7 @@ | ||
25 | #include <sys/ioctl.h> | ||
26 | #include <sys/inotify.h> | ||
27 | #include <sys/utsname.h> | ||
28 | +#include <sys/resource.h> | ||
29 | |||
30 | #include "udev.h" | ||
31 | #include "sd-daemon.h" | ||
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init index d521685197..ca02abb6f1 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init | |||
@@ -13,7 +13,7 @@ export TZ=/etc/localtime | |||
13 | 13 | ||
14 | [ -d /sys/class ] || exit 1 | 14 | [ -d /sys/class ] || exit 1 |
15 | [ -r /proc/mounts ] || exit 1 | 15 | [ -r /proc/mounts ] || exit 1 |
16 | [ -x /sbin/udevd ] || exit 1 | 16 | [ -x /lib/udev/udevd ] || exit 1 |
17 | [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache | 17 | [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache |
18 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf | 18 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf |
19 | 19 | ||
@@ -70,15 +70,15 @@ kill_udevd > "/dev/null" 2>&1 | |||
70 | 70 | ||
71 | # trigger the sorted events | 71 | # trigger the sorted events |
72 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | 72 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug |
73 | /sbin/udevd -d | 73 | /lib/udev/udevd -d |
74 | 74 | ||
75 | /sbin/udevadm control --env=STARTUP=1 | 75 | /usr/bin/udevadm control --env=STARTUP=1 |
76 | if [ "$not_first_boot" != "" ];then | 76 | if [ "$not_first_boot" != "" ];then |
77 | /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform | 77 | /usr/bin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform |
78 | (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& | 78 | (/usr/bin/udevadm settle --timeout=3; /usr/bin/udevadm control --env=STARTUP=)& |
79 | else | 79 | else |
80 | /sbin/udevadm trigger --action=add | 80 | /usr/bin/udevadm trigger --action=add |
81 | /sbin/udevadm settle | 81 | /usr/bin/udevadm settle |
82 | fi | 82 | fi |
83 | 83 | ||
84 | exit 0 | 84 | exit 0 |
diff --git a/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch b/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch deleted file mode 100644 index 2086fe1e27..0000000000 --- a/meta/recipes-core/udev/udev/udev-166-v4l1-1.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> | ||
4 | Date: 2011-03-26 | ||
5 | Initial Package Version: 166 | ||
6 | Upstream Status: From upstream | ||
7 | Origin: http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b | ||
8 | Description: Fixes a compilation error caused by the removal of the | ||
9 | Video for Linux 1 API from Linux kernels from 2.6.38 | ||
10 | onwards. | ||
11 | |||
12 | diff -Naur udev-166.orig/extras/v4l_id/v4l_id.c udev-166/extras/v4l_id/v4l_id.c | ||
13 | --- udev-166.orig/extras/v4l_id/v4l_id.c 2009-12-03 12:45:03.000000000 +0000 | ||
14 | +++ udev-166/extras/v4l_id/v4l_id.c 2011-03-25 20:26:33.000000000 +0000 | ||
15 | @@ -28,7 +28,6 @@ | ||
16 | #include <sys/types.h> | ||
17 | #include <sys/time.h> | ||
18 | #include <sys/ioctl.h> | ||
19 | -#include <linux/videodev.h> | ||
20 | #include <linux/videodev2.h> | ||
21 | |||
22 | int main (int argc, char *argv[]) | ||
23 | @@ -39,7 +38,6 @@ | ||
24 | }; | ||
25 | int fd; | ||
26 | char *device; | ||
27 | - struct video_capability v1cap; | ||
28 | struct v4l2_capability v2cap; | ||
29 | |||
30 | while (1) { | ||
31 | @@ -82,19 +80,6 @@ | ||
32 | if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) | ||
33 | printf("radio:"); | ||
34 | printf("\n"); | ||
35 | - } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { | ||
36 | - printf("ID_V4L_VERSION=1\n"); | ||
37 | - printf("ID_V4L_PRODUCT=%s\n", v1cap.name); | ||
38 | - printf("ID_V4L_CAPABILITIES=:"); | ||
39 | - if ((v1cap.type & VID_TYPE_CAPTURE) > 0) | ||
40 | - printf("capture:"); | ||
41 | - if ((v1cap.type & VID_TYPE_OVERLAY) > 0) | ||
42 | - printf("video_overlay:"); | ||
43 | - if (v1cap.audios > 0) | ||
44 | - printf("audio:"); | ||
45 | - if ((v1cap.type & VID_TYPE_TUNER) > 0) | ||
46 | - printf("tuner:"); | ||
47 | - printf("\n"); | ||
48 | } | ||
49 | |||
50 | close (fd); | ||
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache index 9c24e76514..0f3d7cd3f3 100644 --- a/meta/recipes-core/udev/udev/udev-cache +++ b/meta/recipes-core/udev/udev/udev-cache | |||
@@ -12,7 +12,7 @@ | |||
12 | export TZ=/etc/localtime | 12 | export TZ=/etc/localtime |
13 | 13 | ||
14 | [ -r /proc/mounts ] || exit 1 | 14 | [ -r /proc/mounts ] || exit 1 |
15 | [ -x /sbin/udevd ] || exit 1 | 15 | [ -x /lib/udev/udevd ] || exit 1 |
16 | [ -d /sys/class ] || exit 1 | 16 | [ -d /sys/class ] || exit 1 |
17 | 17 | ||
18 | [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache | 18 | [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache |