diff options
| author |   Rene Wagner <rw@handhelds.org> | 2006-04-19 19:29:27 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-19 19:29:27 +0000 |
| commit | 1ba8f5307fffbbf05c9cc880869b7195b6351b61 (patch) | |
| tree | dc661df1b9d3af885cae8c7e884d04e7c8d49faa /packages | |
| parent | d81e588fe97f86e13c15c1e9228d71126e0e6d88 (diff) | |
| download | openembedded-1ba8f5307fffbbf05c9cc880869b7195b6351b61.tar.gz | |
rename detect-stylus-nox to detect-tsdevice and make it not RCONFLICT detect-stylus any more
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/detect-stylus/detect-tsdevice_0.13.bb (renamed from packages/detect-stylus/detect-stylus-nox_0.13.bb) | 8 | ||||
| -rw-r--r-- | packages/detect-stylus/files/nox.patch | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/packages/detect-stylus/detect-stylus-nox_0.13.bb b/packages/detect-stylus/detect-tsdevice_0.13.bb index 8af001e846..a42a14c88b 100644 --- a/packages/detect-stylus/detect-stylus-nox_0.13.bb +++ b/packages/detect-stylus/detect-tsdevice_0.13.bb @@ -1,12 +1,10 @@ inherit gpe -DESCRIPTION = "Touchscreen detection utility - without X support" +DESCRIPTION = "Touchscreen device detection utility" LICENSE = "GPL" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "base" -RCONFLICTS = "detect-stylus" - SRC_URI = "${GPE_MIRROR}/detect-stylus-${PV}.tar.gz \ file://access.patch;patch=1;pnum=0 \ file://extra-device-check.patch;patch=1 \ @@ -16,3 +14,7 @@ S = "${WORKDIR}/detect-stylus-${PV}" export CVSBUILD = "no" export NOX = "yes" + +do_install_append () { + mv ${D}${bindir}/detect-stylus ${D}${bindir}/detect-tsdevice +} diff --git a/packages/detect-stylus/files/nox.patch b/packages/detect-stylus/files/nox.patch index 036a2f251f..8bee53613f 100644 --- a/packages/detect-stylus/files/nox.patch +++ b/packages/detect-stylus/files/nox.patch @@ -27,7 +27,7 @@ diff -ur detect-stylus-0.13.orig/Makefile detect-stylus-0.13/Makefile Only in detect-stylus-0.13: detect-stylus diff -ur detect-stylus-0.13.orig/detect-stylus.c detect-stylus-0.13/detect-stylus.c --- detect-stylus-0.13.orig/detect-stylus.c 2006-04-18 20:22:13.000000000 +0200 -+++ detect-stylus-0.13/detect-stylus.c 2006-04-18 20:57:01.000000000 +0200 ++++ detect-stylus-0.13/detect-stylus.c 2006-04-19 21:18:09.000000000 +0200 @@ -14,8 +14,10 @@ #include <dirent.h> #include <string.h> @@ -55,7 +55,16 @@ diff -ur detect-stylus-0.13.orig/detect-stylus.c detect-stylus-0.13/detect-stylu int fd; int i; -@@ -119,6 +124,10 @@ +@@ -55,6 +60,8 @@ + if (!strcmp (argv[i], "--device")) + flag_device = 1; + } ++ if (strstr (argv[0], "detect-tsdevice")) ++ flag_device = 1; + + fd = try_open ("/dev/touchscreen/0"); + +@@ -119,6 +126,10 @@ if (flag_device) exit (1); /* Nothing found */ @@ -66,7 +75,7 @@ diff -ur detect-stylus-0.13.orig/detect-stylus.c detect-stylus-0.13/detect-stylu if (fd >= 0) { close (fd); -@@ -141,4 +150,5 @@ +@@ -141,4 +152,5 @@ } exit (0); |