From: "Franklin S. Cooper Jr" <[email protected]> * Tslib.sh is copied to /etc/profile.d/ to set default environment variables specific to touchscreen. * However, in Arago additional env variable logic for touchscreen is required and is currently located within Matrix's init script. * Pull the additional logic from Matrix's init script and move it into this file so tslib.sh will set the correct environment variable globally.
Signed-off-by: Franklin S. Cooper Jr <[email protected]> --- .../recipes-graphics/tslib/files/tslib.sh | 17 +++++++++++++++++ .../tslib/tslib_1.1.bbappend} | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta-arago-distro/recipes-graphics/tslib/files/tslib.sh copy meta-arago-distro/{recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend => recipes-graphics/tslib/tslib_1.1.bbappend} (56%) diff --git a/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh b/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh new file mode 100644 index 0000000..f22ec9c --- /dev/null +++ b/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +### Touchscreen Environment Variables ### + +if [ ! -e /dev/input/touchscreen0 ]; then + exit +fi + +export TSLIB_TSDEVICE=/dev/input/touchscreen0 + +mount | grep /run/media/mmcblk0p1 | grep vfat > /dev/null 2>&1 +if [ "$?" = "0" ] +then + export TSLIB_CALIBFILE=/run/media/mmcblk0p1/pointercal +else + export TSLIB_CALIBFILE=/etc/pointercal +fi diff --git a/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend similarity index 56% copy from meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend copy to meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend index c0ab069..875218d 100644 --- a/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend @@ -1,4 +1,4 @@ # look for files in this layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" PR_append = "-arago0" -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
