diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2012-09-21 13:57:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-25 17:50:19 +0100 |
commit | 4d7b2d2944933c4f03e80adfc32b626abee609a1 (patch) | |
tree | eb4393f361f0b2993daab2530fd6ed449722d58b /meta/recipes-core/udev/udev/udev-166-v4l1-1.patch | |
parent | ad39133c4c61657d4d27fd1b8490014705dcc5b8 (diff) | |
download | poky-4d7b2d2944933c4f03e80adfc32b626abee609a1.tar.gz |
udev: upgrade to 182
This is the final upgrade of udev. Futher upgrades will only
come in conjunction with systemd.
The v4l1 removal patch is deprecated as the bug is fixed inside udev.
There is a new patch fixing the path for default sh interpreter.
New debug binaries are generated, and udev.inc is modified to package
those correctly.
The install locations changed for udevd and udevadm, so the scripts
are updated accordingly.
(From OE-Core rev: 3cbe52b94c4d559a037347ac419fafee5af84fe6)
(From OE-Core rev: 8fc73baecf1b21b1a3e7eff478e25d2a7cae2879)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Conflicts:
meta/recipes-core/udev/udev_164.bb
sgw - Fixed up DEPENDS += and added some OECONF options that where in the
meta-oe version and make sense to be included.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev/udev/udev-166-v4l1-1.patch')
-rw-r--r-- | meta/recipes-core/udev/udev/udev-166-v4l1-1.patch | 50 |
1 files changed, 0 insertions, 50 deletions
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); | ||