diff options
author | Matthew McClintock <msm@freescale.com> | 2011-09-28 23:21:08 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-29 16:54:39 +0100 |
commit | 8418fe82f14dc4500f195eb5aa15e053b7e28c0e (patch) | |
tree | 0aca9e7649a7a3a4796a53bf7db963cbf30cdaa1 /meta/recipes-core/udev | |
parent | 742df8f30b613e771b2e243b8f1cc5412511432c (diff) | |
download | poky-8418fe82f14dc4500f195eb5aa15e053b7e28c0e.tar.gz |
Add udev patch to compile against newer kernels
This patch is needed to compile against newer kernels which have
changed their API
(From OE-Core rev: 60b04097c7aeca2c4d529b2f23343a507fa68ea6)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r-- | meta/recipes-core/udev/files/udev-166-v4l1-1.patch | 50 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev_164.bb | 4 |
2 files changed, 53 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/files/udev-166-v4l1-1.patch b/meta/recipes-core/udev/files/udev-166-v4l1-1.patch new file mode 100644 index 0000000000..2086fe1e27 --- /dev/null +++ b/meta/recipes-core/udev/files/udev-166-v4l1-1.patch | |||
@@ -0,0 +1,50 @@ | |||
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_164.bb b/meta/recipes-core/udev/udev_164.bb index 567e62e3ff..f20da27c55 100644 --- a/meta/recipes-core/udev/udev_164.bb +++ b/meta/recipes-core/udev/udev_164.bb | |||
@@ -1,6 +1,8 @@ | |||
1 | include udev-new.inc | 1 | include udev-new.inc |
2 | 2 | ||
3 | PR = "r3" | 3 | PR = "r4" |
4 | |||
5 | SRC_URI += "file://udev-166-v4l1-1.patch" | ||
4 | 6 | ||
5 | SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" | 7 | SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" |
6 | SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" | 8 | SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" |