summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r--meta/recipes-core/udev/udev.inc29
-rw-r--r--meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch35
-rw-r--r--meta/recipes-core/udev/udev/include_resource.patch31
-rw-r--r--meta/recipes-core/udev/udev/init14
-rw-r--r--meta/recipes-core/udev/udev/udev-166-v4l1-1.patch50
-rw-r--r--meta/recipes-core/udev/udev/udev-cache2
-rw-r--r--meta/recipes-core/udev/udev_164.bb9
-rw-r--r--meta/recipes-core/udev/udev_182.bb9
8 files changed, 74 insertions, 105 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 329f727c5c..ce7eec115e 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -6,16 +6,18 @@ LICENSE = "GPLv2.0+ & LGPLv2.1+"
6LICENSE_${PN} = "GPLv2.0+" 6LICENSE_${PN} = "GPLv2.0+"
7LICENSE_libudev = "LGPLv2.1+" 7LICENSE_libudev = "LGPLv2.1+"
8LICENSE_libgudev = "LGPLv2.1+" 8LICENSE_libgudev = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 10 file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
11 file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" 11 file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
12
12 13
13DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native" 14DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native util-linux"
14RPROVIDES_${PN} = "hotplug" 15RPROVIDES_${PN} = "hotplug"
15RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids pciutils-ids" 16RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids pciutils-ids"
16RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})" 17RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
17 18
18SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 19SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
20 file://0001-Fixing-keyboard_force_release.sh-shell-script-path.patch \
19 file://run.rules \ 21 file://run.rules \
20 file://udev.rules \ 22 file://udev.rules \
21 file://devfs-udev.rules \ 23 file://devfs-udev.rules \
@@ -30,9 +32,18 @@ inherit autotools pkgconfig update-rc.d
30 32
31# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ 33# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
32sbindir = "${base_sbindir}" 34sbindir = "${base_sbindir}"
33libexecdir = "${base_libdir}/udev" 35libexecdir = "${base_libdir}"
34EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \ 36EXTRA_OECONF = "--disable-introspection \
35 --with-pci-ids-path=${datadir}/pci.ids" 37 --with-rootlibdir=${base_libdir} \
38 --with-pci-ids-path=${datadir}/pci.ids \
39 ac_cv_file__usr_share_pci_ids=no \
40 ac_cv_file__usr_share_hwdata_pci_ids=no \
41 ac_cv_file__usr_share_misc_pci_ids=yes \
42 --sbindir=${base_sbindir} \
43 --libexecdir=${base_libdir} \
44 --with-rootlibdir=${base_libdir} \
45 --with-rootprefix= \
46 "
36 47
37PACKAGES =+ "udev-acl udev-consolekit udev-utils" 48PACKAGES =+ "udev-acl udev-consolekit udev-utils"
38PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" 49PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
@@ -48,6 +59,8 @@ FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
48RRECOMMENDS_${PN} += "udev-utils" 59RRECOMMENDS_${PN} += "udev-utils"
49 60
50FILES_${PN}-dbg += "${libexecdir}/.debug" 61FILES_${PN}-dbg += "${libexecdir}/.debug"
62FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
63FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
51FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc" 64FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
52FILES_libudev = "${base_libdir}/libudev.so.*" 65FILES_libudev = "${base_libdir}/libudev.so.*"
53FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*" 66FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
@@ -82,4 +95,6 @@ do_install_append () {
82 95
83 # hid2hci has moved to bluez4. removed in udev as of version 169 96 # hid2hci has moved to bluez4. removed in udev as of version 169
84 rm -f ${D}${base_libdir}/udev/hid2hci 97 rm -f ${D}${base_libdir}/udev/hid2hci
98
99 echo 'run_path="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
85} 100}
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 @@
1From 0f8290c943da298abd269ca60fd8375dfb219971 Mon Sep 17 00:00:00 2001
2From: Alexandru DAMIAN <alexandru.damian@intel.com>
3Date: Thu, 12 Jul 2012 12:54:48 +0300
4Subject: [PATCH] Fixing keyboard_force_release.sh shell script path
5
6With the introduction of rootprefix, the keyboard-force-release.sh.in
7was modified to be executed with @rootprefix@/bin/sh, which is wrong
8because @rootprefix@ defaults to /usr (which is correct), but the
9shell is always at /bin/sh (IEEE Std 1003.2-1992).
10
11Therefore the interpreter for shell scripts needs to be /bin/sh at all times.
12
13The upstream moved to configurable root prefix, this patch taclkes a
14transition bug, and will not be applied upstream.
15
16Upstream-Status: Inappropriate [legacy version]
17
18Signed-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
23diff --git a/src/keymap/keyboard-force-release.sh.in b/src/keymap/keyboard-force-release.sh.in
24index 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--
341.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 @@
1Fixes errors like below with eglibc 2.16
2
3libudev/libudev-util-private.c:348:16: error: 'PRIO_PROCESS' undeclared (first use in this function)
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7
8Index: 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"
20Index: 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
72echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug 72echo -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
76if [ "$not_first_boot" != "" ];then 76if [ "$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=)&
79else 79else
80 /sbin/udevadm trigger --action=add 80 /usr/bin/udevadm trigger --action=add
81 /sbin/udevadm settle 81 /usr/bin/udevadm settle
82fi 82fi
83 83
84exit 0 84exit 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 @@
1Upstream-Status: Backport
2
3Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
4Date: 2011-03-26
5Initial Package Version: 166
6Upstream Status: From upstream
7Origin: http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=4ace8a43ac2cbbd4d6f5c29fc461c3caa8f8545b
8Description: 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
12diff -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 @@
12export TZ=/etc/localtime 12export 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
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
deleted file mode 100644
index c877be58f9..0000000000
--- a/meta/recipes-core/udev/udev_164.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1include udev.inc
2
3PR = "r17"
4
5SRC_URI += "file://udev-166-v4l1-1.patch \
6 file://include_resource.patch \
7 "
8SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
9SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
diff --git a/meta/recipes-core/udev/udev_182.bb b/meta/recipes-core/udev/udev_182.bb
new file mode 100644
index 0000000000..a64f4374af
--- /dev/null
+++ b/meta/recipes-core/udev/udev_182.bb
@@ -0,0 +1,9 @@
1include udev.inc
2
3PR = "r0"
4
5# module-init-tools from kmod_git will provide libkmod runtime
6DEPENDS += "module-init-tools"
7
8SRC_URI[md5sum] = "1b964456177fbf48023dfee7db3a708d"
9SRC_URI[sha256sum] = "7857ed19fafd8f3ca8de410194e8c7336e9eb8a20626ea8a4ba6449b017faba4"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-25 04:39:20 +0000