[oe-commits] mike.looijmans at topic.nl : busybox/find-touchscreen.sh: Simplify script and recognize USB devices

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e82353eb9f76b582122fda27c93339eac5553eb2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e82353eb9f76b582122fda27c93339eac5553eb2

Author: mike.looijmans at topic.nl <mike.looijmans at topic.nl>
Date:   Thu Dec 18 15:17:29 2014 +0100

busybox/find-touchscreen.sh: Simplify script and recognize USB devices

Simplify the grep expression, use the more common "grep" command instead
of "egrep", avoid forking extra processes, join multiple invokations into
a single combined expression.

Change the touchscreen regex so that it also recognizes various USB
touchscreen controllers and the ad7879 i2c device.

Based on code used in OpenPLi and meta-topic.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/busybox/files/find-touchscreen.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/busybox/files/find-touchscreen.sh b/meta/recipes-core/busybox/files/find-touchscreen.sh
index 1582ea8..52c5e7a 100644
--- a/meta/recipes-core/busybox/files/find-touchscreen.sh
+++ b/meta/recipes-core/busybox/files/find-touchscreen.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
-	ln -sf /dev/input/$MDEV /dev/input/touchscreen0
+if grep -q "input:.*-e0.*,3,.*a0,1,\|ads7846" /sys/class/$MDEV/device/modalias ; then
+	ln -sf /dev/$MDEV /dev/input/touchscreen0
 fi
 
-if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
-	ln -sf /dev/input/$MDEV /dev/input/touchscreen0
-fi