* touchscreen calibration has been moved to a separate package since it is not required for all devices.
Signed-off-by: Chase Maupin <[email protected]> --- .../recipes-core/matrix/matrix-gui/init | 25 +------------------- .../recipes-core/matrix/matrix-gui_2.0.bb | 2 +- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/init b/meta-arago-extras/recipes-core/matrix/matrix-gui/init index 5e1f741..dab7dc6 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui/init +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/init @@ -9,7 +9,6 @@ test -x "$matrixgui" || exit 0 export TSLIB_TSDEVICE=/dev/input/touchscreen0 export QWS_MOUSE_PROTO=Auto -tsfile=/etc/pointercal case "$1" in start) @@ -24,32 +23,10 @@ case "$1" in # in the kernel. This should have no impact on cortex-A8 devices. echo 2 > /proc/cpu/alignment - # Do not try to calibrate the touchscreen if it doesn't exist. + # Set the QWS_MOUSE_PROTO for touchscreen if it exists if [ -e /dev/input/touchscreen0 ] then export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 - # Check if the SD card is mounted and the first partition is - # vfat. If so let's write the pointercal file there so that if - # someone messes up calibration they can just delete the file from - # any system and reboot the board. - mount | grep /media/mmcblk0p1 | grep vfat > /dev/null 2>&1 - if [ "$?" = "0" ] - then - tsfile=/media/mmcblk0p1/pointercal - export TSLIB_CALIBFILE=$tsfile - fi - - if [ ! -f $tsfile ] ; then - echo -n "Calibrating touchscreen (first time only)" - ts_calibrate - echo "." - # If we create a pointercal file and it was not in /etc/pointercal - # let's copy it there as well if it does not already exist. - if [ ! -f /etc/pointercal -a -f $tsfile ] - then - cp $tsfile /etc/pointercal - fi - fi fi #Clear out the the tmp and lock directory diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb index 54359e5..fa1f1e0 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d" SECTION = "multimedia" -PR = "r13" +PR = "r14" INITSCRIPT_NAME = "matrix-gui-2.0" INITSCRIPT_PARAMS = "defaults 97" -- 1.7.0.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
