From 1fa91d356dc0108902f9dde52d25f124bfe40e3c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 Jan 2014 13:18:44 +0200 Subject: udev: disable udev-cache on beaglebone With udev-cache enabled, usb kernel modules were not loaded. Change-Id: I11e5bec4a5b7aa1be30ecb016911a86ab1431dbb Reviewed-by: Samuli Piippo --- recipes/udev/0001-support-multitouch-screens.patch | 28 ---------------------- .../udev/0001-support-multitouch-screens.patch | 28 ++++++++++++++++++++++ recipes/udev/udev/beaglebone/udev-cache.default | 4 ++++ recipes/udev/udev_182.bbappend | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) delete mode 100644 recipes/udev/0001-support-multitouch-screens.patch create mode 100644 recipes/udev/udev/0001-support-multitouch-screens.patch create mode 100644 recipes/udev/udev/beaglebone/udev-cache.default diff --git a/recipes/udev/0001-support-multitouch-screens.patch b/recipes/udev/0001-support-multitouch-screens.patch deleted file mode 100644 index aacb8e0..0000000 --- a/recipes/udev/0001-support-multitouch-screens.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 12 Apr 2013 09:41:41 +0300 -Subject: [PATCH] support multitouch screens - ---- - src/udev-builtin-input_id.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c -index a062ef7..0c5358e 100644 ---- a/src/udev-builtin-input_id.c -+++ b/src/udev-builtin-input_id.c -@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev, - return; - } - -- if (test_bit (EV_ABS, bitmask_ev) && -- test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) { -+ if (test_bit (EV_ABS, bitmask_ev) && ( -+ (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) || -+ (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) { - if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key)) - udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1"); - else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) --- -1.7.10.4 - diff --git a/recipes/udev/udev/0001-support-multitouch-screens.patch b/recipes/udev/udev/0001-support-multitouch-screens.patch new file mode 100644 index 0000000..aacb8e0 --- /dev/null +++ b/recipes/udev/udev/0001-support-multitouch-screens.patch @@ -0,0 +1,28 @@ +From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 12 Apr 2013 09:41:41 +0300 +Subject: [PATCH] support multitouch screens + +--- + src/udev-builtin-input_id.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c +index a062ef7..0c5358e 100644 +--- a/src/udev-builtin-input_id.c ++++ b/src/udev-builtin-input_id.c +@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev, + return; + } + +- if (test_bit (EV_ABS, bitmask_ev) && +- test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) { ++ if (test_bit (EV_ABS, bitmask_ev) && ( ++ (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) || ++ (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) { + if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key)) + udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1"); + else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) +-- +1.7.10.4 + diff --git a/recipes/udev/udev/beaglebone/udev-cache.default b/recipes/udev/udev/beaglebone/udev-cache.default new file mode 100644 index 0000000..d0050b8 --- /dev/null +++ b/recipes/udev/udev/beaglebone/udev-cache.default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 761d792..970f8fb 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -20,7 +20,7 @@ ## ############################################################################# -FILESEXTRAPATHS_prepend := "${THISDIR}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-support-multitouch-screens.patch" -- cgit v1.2.3-54-g00ecf