summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/recipes-core/udev/eudev/devfs-udev.rules (renamed from meta/recipes-core/udev/udev/devfs-udev.rules)0
-rw-r--r--meta/recipes-core/udev/eudev/init (renamed from meta/recipes-core/udev/udev/init)0
-rw-r--r--meta/recipes-core/udev/eudev/links.conf (renamed from meta/recipes-core/udev/udev/links.conf)0
-rw-r--r--meta/recipes-core/udev/eudev/local.rules (renamed from meta/recipes-core/udev/udev/local.rules)0
-rw-r--r--meta/recipes-core/udev/eudev/permissions.rules (renamed from meta/recipes-core/udev/udev/permissions.rules)0
-rw-r--r--meta/recipes-core/udev/eudev/run.rules (renamed from meta/recipes-core/udev/udev/run.rules)0
-rw-r--r--meta/recipes-core/udev/eudev/udev-cache (renamed from meta/recipes-core/udev/udev/udev-cache)0
-rw-r--r--meta/recipes-core/udev/eudev/udev-cache.default (renamed from meta/recipes-core/udev/udev/udev-cache.default)0
-rw-r--r--meta/recipes-core/udev/eudev/udev.rules (renamed from meta/recipes-core/udev/udev/udev.rules)0
-rw-r--r--meta/recipes-core/udev/eudev_3.1.5.bb93
-rw-r--r--meta/recipes-core/udev/udev.inc112
-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/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch29
-rw-r--r--meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch52
-rw-r--r--meta/recipes-core/udev/udev/add-install-ptest.patch86
-rw-r--r--meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch25
-rw-r--r--meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch58
-rw-r--r--meta/recipes-core/udev/udev/run-ptest5
-rw-r--r--meta/recipes-core/udev/udev_182.bb9
20 files changed, 94 insertions, 412 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index bb382bd686..ba85c78906 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -44,7 +44,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
44PREFERRED_PROVIDER_console-tools ?= "kbd" 44PREFERRED_PROVIDER_console-tools ?= "kbd"
45PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 45PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
46PREFERRED_PROVIDER_make ?= "make" 46PREFERRED_PROVIDER_make ?= "make"
47PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" 47PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
48# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 48# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
49# on this rather strange entry. 49# on this rather strange entry.
50PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" 50PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}"
diff --git a/meta/recipes-core/udev/udev/devfs-udev.rules b/meta/recipes-core/udev/eudev/devfs-udev.rules
index 0ba1ad4e7f..0ba1ad4e7f 100644
--- a/meta/recipes-core/udev/udev/devfs-udev.rules
+++ b/meta/recipes-core/udev/eudev/devfs-udev.rules
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/eudev/init
index 0ab028b391..0ab028b391 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/eudev/init
diff --git a/meta/recipes-core/udev/udev/links.conf b/meta/recipes-core/udev/eudev/links.conf
index 8fff922db6..8fff922db6 100644
--- a/meta/recipes-core/udev/udev/links.conf
+++ b/meta/recipes-core/udev/eudev/links.conf
diff --git a/meta/recipes-core/udev/udev/local.rules b/meta/recipes-core/udev/eudev/local.rules
index d502cdd6ba..d502cdd6ba 100644
--- a/meta/recipes-core/udev/udev/local.rules
+++ b/meta/recipes-core/udev/eudev/local.rules
diff --git a/meta/recipes-core/udev/udev/permissions.rules b/meta/recipes-core/udev/eudev/permissions.rules
index 205b733292..205b733292 100644
--- a/meta/recipes-core/udev/udev/permissions.rules
+++ b/meta/recipes-core/udev/eudev/permissions.rules
diff --git a/meta/recipes-core/udev/udev/run.rules b/meta/recipes-core/udev/eudev/run.rules
index 75d71375bb..75d71375bb 100644
--- a/meta/recipes-core/udev/udev/run.rules
+++ b/meta/recipes-core/udev/eudev/run.rules
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/eudev/udev-cache
index dcfff1cb45..dcfff1cb45 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/eudev/udev-cache
diff --git a/meta/recipes-core/udev/udev/udev-cache.default b/meta/recipes-core/udev/eudev/udev-cache.default
index a3b732698d..a3b732698d 100644
--- a/meta/recipes-core/udev/udev/udev-cache.default
+++ b/meta/recipes-core/udev/eudev/udev-cache.default
diff --git a/meta/recipes-core/udev/udev/udev.rules b/meta/recipes-core/udev/eudev/udev.rules
index a19d4a0bf6..a19d4a0bf6 100644
--- a/meta/recipes-core/udev/udev/udev.rules
+++ b/meta/recipes-core/udev/eudev/udev.rules
diff --git a/meta/recipes-core/udev/eudev_3.1.5.bb b/meta/recipes-core/udev/eudev_3.1.5.bb
new file mode 100644
index 0000000000..8a23e6cb23
--- /dev/null
+++ b/meta/recipes-core/udev/eudev_3.1.5.bb
@@ -0,0 +1,93 @@
1SUMMARY = "eudev is a fork of systemd's udev"
2HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev"
3SRC_URI = "https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz \
4 file://init \
5 file://local.rules \
6 file://udev-cache \
7 file://udev-cache.default \
8 file://run.rules \
9 file://udev.rules \
10 file://devfs-udev.rules \
11 file://links.conf \
12 file://permissions.rules \
13 "
14
15LICENSE = "GPLv2.0+"
16
17inherit autotools update-rc.d
18
19SRC_URI[md5sum] = "e130f892d8744e292cb855db79935f68"
20SRC_URI[sha256sum] = "ce9d5fa91e3a42c7eb95512ca0fa2a631e89833053066bb6cdf42046b2a88553"
21
22LIC_FILES_CHKSUM="file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
23
24DEPENDS = "glib-2.0-native glib-2.0 util-linux libxslt-native gperf-native kmod"
25
26PROVIDES = "udev"
27RPROVIDES_${PN} = "hotplug udev"
28
29PACKAGES =+ "udev-cache"
30PACKAGES =+ "libudev"
31
32INITSCRIPT_PACKAGES = "eudev udev-cache"
33INITSCRIPT_NAME_eudev = "udev"
34INITSCRIPT_PARAMS_eudev = "start 04 S ."
35INITSCRIPT_NAME_udev-cache = "udev-cache"
36INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
37
38RRECOMMENDS_${PN} += "udev-cache"
39
40
41FILES_libudev = "${base_libdir}/libudev.so.*"
42
43FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
44
45
46FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
47 ${includedir}/libudev.h ${libdir}/libudev.so \
48 ${includedir}/udev.h ${libdir}/libudev.la \
49 ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \
50 "
51FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
52
53EXTRA_OECONF = "--with-rootlibdir=${base_libdir} \
54 --sbindir=${base_sbindir} \
55 --libexecdir=${nonarch_base_libdir} \
56 --with-rootprefix= \
57"
58do_install_append(){
59 install -d ${D}${sysconfdir}/init.d
60 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
61 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
62 sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev
63 sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev-cache
64
65 install -d ${D}${sysconfdir}/default
66 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
67
68 touch ${D}${sysconfdir}/udev/cache.data
69
70 install -d ${D}${sysconfdir}/udev/rules.d/
71
72 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
73
74 # Fix for multilib systems where libs along with confs are installed incorrectly
75 if ! [ -d ${D}${nonarch_base_libdir}/udev ]
76 then
77 install -d ${D}${nonarch_base_libdir}/udev
78 mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}
79 fi
80
81 # hid2hci has moved to bluez4. removed in udev as of version 169
82 rm -f ${D}${base_libdir}/udev/hid2hci
83
84 echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
85
86 # Use classic network interface naming scheme
87 touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules
88}
89
90python () {
91 if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
92 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
93}
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
deleted file mode 100644
index 93d736941d..0000000000
--- a/meta/recipes-core/udev/udev.inc
+++ /dev/null
@@ -1,112 +0,0 @@
1SUMMARY = "/dev/ and hotplug management daemon"
2DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
3/dev/, handles hotplug events and loads drivers at boot time."
4HOMEPAGE = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev/udev.html"
5LICENSE = "GPLv2.0+ & LGPLv2.1+"
6LICENSE_${PN} = "GPLv2.0+"
7LICENSE_libudev = "LGPLv2.1+"
8LICENSE_libgudev = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
11 file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
12
13LDFLAGS += "-lrt"
14
15DEPENDS = "glib-2.0 libusb usbutils pciutils glib-2.0-native gperf-native libxslt-native util-linux"
16RPROVIDES_${PN} = "hotplug"
17
18PROVIDES = "libgudev"
19
20SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
21 file://0001-Fixing-keyboard_force_release.sh-shell-script-path.patch \
22 file://avoid-mouse-autosuspend.patch \
23 file://run.rules \
24 file://udev.rules \
25 file://devfs-udev.rules \
26 file://links.conf \
27 file://permissions.rules \
28 file://local.rules \
29 file://udev-cache \
30 file://udev-cache.default \
31 file://add-install-ptest.patch \
32 file://fix_rule-syntax-regex-ptest.patch \
33 file://run-ptest \
34 file://init \
35 file://0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch \
36 file://0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch \
37 "
38
39inherit autotools pkgconfig update-rc.d ptest
40RDEPENDS_${PN}-ptest += "make perl python"
41
42libexecdir = "${base_libdir}"
43EXTRA_OECONF = "--disable-introspection \
44 --with-rootlibdir=${base_libdir} \
45 --with-pci-ids-path=${datadir}/pci.ids \
46 ac_cv_file__usr_share_pci_ids=no \
47 ac_cv_file__usr_share_hwdata_pci_ids=no \
48 ac_cv_file__usr_share_misc_pci_ids=yes \
49 --sbindir=${base_sbindir} \
50 --libexecdir=${nonarch_base_libdir} \
51 --with-rootlibdir=${base_libdir} \
52 --with-rootprefix= \
53 --without-systemdsystemunitdir \
54 "
55
56PACKAGES =+ "udev-cache"
57PACKAGES =+ "libudev"
58PACKAGES =+ "libgudev"
59
60INITSCRIPT_PACKAGES = "udev udev-cache"
61INITSCRIPT_NAME_udev = "udev"
62INITSCRIPT_PARAMS_udev = "start 04 S ."
63INITSCRIPT_NAME_udev-cache = "udev-cache"
64INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
65
66FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm"
67RRECOMMENDS_${PN} += "udev-cache"
68
69# udev-utils has been removed as a package. Note that udev conflicts with udev-utils so that
70# udev-utils is removed from systems on upgrade.
71RCONFLICTS_${PN} += "udev-utils"
72RREPLACES_${PN} += "udev-utils"
73
74FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
75 ${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
76 ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \
77 ${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
78 ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
79FILES_libudev = "${base_libdir}/libudev.so.*"
80FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
81FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
82
83do_install_append () {
84 install -d ${D}${sysconfdir}/init.d
85 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
86 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
87 sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev
88 sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache
89
90 install -d ${D}${sysconfdir}/default
91 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
92
93 touch ${D}${sysconfdir}/udev/cache.data
94
95 install -d ${D}${sysconfdir}/udev/rules.d/
96
97 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
98
99 # hid2hci has moved to bluez4. removed in udev as of version 169
100 rm -f ${D}${base_libdir}/udev/hid2hci
101
102 echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
103}
104
105# As systemd also builds udev, skip this package if we're doing a systemd build.
106python () {
107 if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
108 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
109}
110do_compile_ptest() {
111 oe_runmake test-udev
112}
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
deleted file mode 100644
index 41deafa918..0000000000
--- a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch b/meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch
deleted file mode 100644
index 8d2df1a390..0000000000
--- a/meta/recipes-core/udev/udev/0001-mtd_probe.h-Add-stdint.h-as-it-was-removed-from-mtd-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 2935f9b2dfb92c3ce4376a988cd01b624430905b Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 19 Jan 2016 09:49:56 -0800
4Subject: [PATCH 1/2] mtd_probe.h: Add stdint.h as it was removed from
5 mtd-user.h in the kernel
6
7
8Upstream-Status: Inappropriate [Upstream unsupported]
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11---
12 src/mtd_probe/mtd_probe.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
16index 2a37ede..49c1918 100644
17--- a/src/mtd_probe/mtd_probe.h
18+++ b/src/mtd_probe/mtd_probe.h
19@@ -18,6 +18,7 @@
20 */
21
22 #include <mtd/mtd-user.h>
23+#include <stdint.h>
24
25 /* Full oob structure as written on the flash */
26 struct sm_oob {
27--
282.5.0
29
diff --git a/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch b/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch
deleted file mode 100644
index a9dc627459..0000000000
--- a/meta/recipes-core/udev/udev/0002-configure.ac-Makefile.am-Check-for-input.h-and-input.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 63ae7ebb0c6177efed46734061fb59c458a47a26 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 19 Jan 2016 09:49:19 -0800
4Subject: [PATCH 2/2] configure.ac/Makefile.am: Check for input.h and
5 input-event-codes.h
6
7Add INPUT_HEADER to know which header file to use because it changed
8in the 4.4 kernel code.
9
10Set INPUT_HEADER with default linux/input.h if it exists and if the
11newer input-events-codes.h exists from 4.4 use it instead.
12
13Upstream-Status: Inappropriate [Upstream unsupported]
14
15Signed-off-by: Saul Wold <sgw@linux.intel.com>
16---
17 Makefile.am | 2 +-
18 configure.ac | 4 +++-
19 2 files changed, 4 insertions(+), 2 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 2e32e69..04eb194 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -591,7 +591,7 @@ dist_udevkeymapforcerel_DATA = \
26 src/keymap/force-release-maps/samsung-other \
27 src/keymap/force-release-maps/common-volume-keys
28
29-src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
30+src/keymap/keys.txt: $(INCLUDE_PREFIX)/$(INPUT_HEADER)
31 $(AM_V_at)mkdir -p src/keymap
32 $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
33
34diff --git a/configure.ac b/configure.ac
35index 0500313..9674620 100644
36--- a/configure.ac
37+++ b/configure.ac
38@@ -154,8 +154,10 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
39 if test -z "$GPERF"; then
40 AC_MSG_ERROR([gperf is needed])
41 fi
42+
43+ AC_CHECK_HEADER([linux/input.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input.h')])], AC_MSG_ERROR([kernel headers not found]))
44+ AC_CHECK_HEADER([linux/input-event-codes.h], [AC_SUBST([INPUT_HEADER], [$(echo 'linux/input-event-codes.h')])], [:])
45
46- AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
47 AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
48 ])
49 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
50--
512.5.0
52
diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/meta/recipes-core/udev/udev/add-install-ptest.patch
deleted file mode 100644
index bfc2e9409d..0000000000
--- a/meta/recipes-core/udev/udev/add-install-ptest.patch
+++ /dev/null
@@ -1,86 +0,0 @@
1Adjustements for ptest:
2
3- Add 'install-ptest' rule.
4- Print a standard result line for each test.
5- Replace the use of "tree" with "find".
6
7Signed-off-by: Björn Stenberg <bjst@enea.com>
8Signed-off-by: Alexandra Safta <alst@enea.com>
9Upstream-Status: Pending
10
11Add missing files for rule-syntax-check
12- Add rule-syntax-check.py
13- Add the deployed udev rules to the testdata
14
15Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
16Upstream-Status: Pending
17--- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100
18+++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100
19@@ -708,3 +708,18 @@
20 for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done
21 for i in src/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
22 for i in src/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done
23+
24+RULES = rules/* src/accelerometer/61-accelerometer.rules \
25+ src/cdrom_id/60-cdrom_id.rules \
26+ src/keymap/95-keyboard-force-release.rules src/keymap/95-keymap.rules \
27+ src/mtd_probe/75-probe_mtd.rules src/v4l_id/60-persistent-v4l.rules
28+
29+install-ptest:
30+ install test-udev $(DESTDIR)
31+ cp Makefile $(DESTDIR)
32+ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile
33+ install -d $(DESTDIR)/test $(DESTDIR)/rules
34+ (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test)
35+ (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test)
36+ (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules)
37+ cp $(top_srcdir)/test/sys.tar.xz $(DESTDIR)/test/
38--- a/test/udev-test.pl 2012-03-18 16:43:36.000000000 +0100
39+++ b/test/udev-test.pl 2013-02-18 10:31:29.706357321 +0100
40@@ -1459,11 +1459,13 @@
41 print "add: error";
42 if ($rules->{exp_add_error}) {
43 print " as expected\n";
44+ print "XFAIL: TEST $number: $rules->{desc}: add\n";
45 } else {
46 print "\n";
47- system("tree $udev_root");
48+ system("find $udev_root");
49 print "\n";
50 $error++;
51+ print "FAIL: TEST $number: $rules->{desc}: add\n";
52 sleep(1);
53 }
54 }
55@@ -1479,15 +1481,18 @@
56 print "remove: error";
57 if ($rules->{exp_rem_error}) {
58 print " as expected\n";
59+ print "XFAIL: TEST $number: $rules->{desc}: remove\n";
60 } else {
61 print "\n";
62- system("tree $udev_root");
63+ system("find $udev_root");
64 print "\n";
65 $error++;
66+ print "FAIL: TEST $number: $rules->{desc}: remove\n";
67 sleep(1);
68 }
69 } else {
70 print "remove: ok\n";
71+ print "PASS: TEST $number: $rules->{desc}: remove\n";
72 }
73
74 print "\n";
75--- a/configure.ac 2013-11-28 09:14:02.814248826 +0100
76+++ b/configure.ac 2013-11-28 09:14:34.260874296 +0100
77@@ -6,7 +6,7 @@
78 [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])
79 AC_CONFIG_SRCDIR([src/udevd.c])
80 AC_CONFIG_AUX_DIR([build-aux])
81-AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects])
82+AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects serial-tests])
83 AC_USE_SYSTEM_EXTENSIONS
84 AC_SYS_LARGEFILE
85 AC_CONFIG_MACRO_DIR([m4])
86
diff --git a/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch b/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch
deleted file mode 100644
index 2c31b33b02..0000000000
--- a/meta/recipes-core/udev/udev/avoid-mouse-autosuspend.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Source: http://cgit.freedesktop.org/systemd/systemd/commit/rules/42-usb-hid-pm.rules?id=e0386cf2809219bbdd30895f46f1f567b56902b6
2
3Some USB ports on external hubs may be reported as "fixed". We only want
4to auto-enable this on ports that are internal to the machine, so check
5the parent state as well.
6
7Upstream-Status: backport
8
9Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
102013/09/13
11
12Index: udev-182/rules/42-usb-hid-pm.rules
13===================================================================
14--- udev-182.orig/rules/42-usb-hid-pm.rules
15+++ udev-182/rules/42-usb-hid-pm.rules
16@@ -46,4 +46,9 @@ ACTION=="add", SUBSYSTEM=="usb", ATTRS{i
17 ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}="0002", TEST=="power/control", ATTR{power/control}="auto"
18
19 # USB HID devices that are internal to the machine should also be safe to autosuspend
20+# And skip it for devices which are external but say "fixed"
21+ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="removable", GOTO="usb_hid_pm_end"
22+ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="unknown", GOTO="usb_hid_pm_end"
23 ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="03", ATTRS{removable}=="fixed", TEST=="../power/control", ATTR{../power/control}="auto"
24+LABEL="usb_hid_pm_end"
25+
diff --git a/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch b/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch
deleted file mode 100644
index 593c46ce03..0000000000
--- a/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1The rule-syntax-check script fails with errors like this:
2
3Invalid line /lib/udev/rules.d/95-keymap.rules:49: ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j"
4(' clause:', 'ATTR{[dmi/id]product_name}=="W3J"')
5()
6
7
8Move line comment from end of rules file to its own line, the regex used to
9test correct syntax choke on it.
10
11The rule-syntax-check.py uses regex which errournessly complains on ATTR rules
12of the form ATTR{[dmi/id]board_name}=="30B7"
13Use the regex from systemd's script which allow [] characters and additional
14compare operators
15
16The Makefile passes rules-test.sh script a build host path to the testdata.
17Ignore the argument and use a relative path instead.
18
19
20Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
21Upstream-Status: Inappropriate (cross environment path)
22
23diff -Naur udev-182.orig/src/keymap/95-keymap.rules udev-182/src/keymap/95-keymap.rules
24--- udev-182.orig/src/keymap/95-keymap.rules 2012-02-07 00:01:55.154640792 +0100
25+++ udev-182/src/keymap/95-keymap.rules 2015-01-24 20:58:40.156930520 +0100
26@@ -94,7 +94,8 @@
27 ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP G62 Notebook PC", RUN+="keymap $name 0xB2 www"
28 ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP ProBook*", RUN+="keymap $name 0xF8 rfkill"
29 # HP Pavillion dv6315ea has empty DMI_VENDOR
30-ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media" # "quick play
31+# "quick play"
32+ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media"
33
34 # Gateway clone of Acer Aspire One AOA110/AOA150
35 ENV{DMI_VENDOR}=="Gateway*", ATTR{[dmi/id]product_name}=="*AOA1*", RUN+="keymap $name acer"
36diff -Naur udev-182.orig/test/rule-syntax-check.py udev-182/test/rule-syntax-check.py
37--- udev-182.orig/test/rule-syntax-check.py 2012-02-15 20:10:12.872333342 +0100
38+++ udev-182/test/rule-syntax-check.py 2015-01-24 21:08:00.496049600 +0100
39@@ -28,7 +28,7 @@
40 no_args_tests = re.compile('(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$')
41 args_tests = re.compile('(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$')
42 no_args_assign = re.compile('(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$')
43-args_assign = re.compile('(ATTR|ENV|IMPORT){([a-zA-Z0-9/_.*%-]+)}\s*=\s*"([^"]*)"$')
44+args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([][a-zA-Z0-9/_.*%-]+)}\s*(=|==|\+=)\s*"([^"]*)"$')
45
46 result = 0
47 buffer = ''
48--- udev-182.orig/test/rules-test.sh 2012-01-29 01:15:46.000000000 +0100
49+++ udev-182/test/rules-test.sh 2015-01-24 17:53:51.201858658 +0100
50@@ -4,7 +4,7 @@
51 # (C) 2010 Canonical Ltd.
52 # Author: Martin Pitt <martin.pitt@ubuntu.com>
53
54-[ -n "$srcdir" ] || srcdir=`dirname $0`/..
55+srcdir=`dirname $0`/..
56
57 # skip if we don't have python
58 type python >/dev/null 2>&1 || {
diff --git a/meta/recipes-core/udev/udev/run-ptest b/meta/recipes-core/udev/udev/run-ptest
deleted file mode 100644
index 0e39806b01..0000000000
--- a/meta/recipes-core/udev/udev/run-ptest
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3tar -C test/ -xJf test/sys.tar.xz
4make -k check-TESTS
5make test-sys-distclean
diff --git a/meta/recipes-core/udev/udev_182.bb b/meta/recipes-core/udev/udev_182.bb
deleted file mode 100644
index b216352035..0000000000
--- a/meta/recipes-core/udev/udev_182.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1include udev.inc
2
3PR = "r9"
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-21 21:59:43 +0000