aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Maupin <chase.maupin@ti.com>2010-05-27 10:54:49 -0500
committerKoen Kooi <koen@openembedded.org>2010-05-28 09:21:14 +0200
commit8c348ea2a4e7a5351a902c09938fbad4548eeafa (patch)
tree5337d07d7679890d5f9d04f2771f24b1d1225aa1
parenta9172ffa7ae4408c176b4b5643fd70a69411114b (diff)
downloadopenembedded-8c348ea2a4e7a5351a902c09938fbad4548eeafa.zip
openembedded-8c348ea2a4e7a5351a902c09938fbad4548eeafa.tar.gz
openembedded-8c348ea2a4e7a5351a902c09938fbad4548eeafa.tar.bz2
matrix-gui-e_svn: Changed executable name
* Upgraded to the latest source revision * Changed the executable name in the recipe and scripts to allow it to co-exist with the X11 version to be added later. Acked-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Chase Maupin <chase.maupin@ti.com> Signed-off-by: Koen Kooi <k-kooi@ti.com>
-rwxr-xr-xrecipes/ti/matrix-gui-e/dm365-evm/init8
-rwxr-xr-xrecipes/ti/matrix-gui-e/init8
-rw-r--r--recipes/ti/matrix-gui-e_svn.bb12
3 files changed, 14 insertions, 14 deletions
diff --git a/recipes/ti/matrix-gui-e/dm365-evm/init b/recipes/ti/matrix-gui-e/dm365-evm/init
index b0e56ff..cd12913 100755
--- a/recipes/ti/matrix-gui-e/dm365-evm/init
+++ b/recipes/ti/matrix-gui-e/dm365-evm/init
@@ -1,5 +1,5 @@
#! /bin/sh
-matrixgui="/usr/bin/matrix_gui"
+matrixgui="/usr/bin/matrix_guiE"
GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
test -x "$matrixgui" || exit 0
@@ -10,16 +10,16 @@ case "$1" in
echo 480P-60 > /sys/class/davinci_display/ch0/mode
echo COMPONENT > /sys/class/davinci_display/ch0/output
echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
+ start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
echo "."
;;
stop)
echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
echo "."
;;
*)
- echo "Usage: /etc/init.d/matrix-gui {start|stop}"
+ echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
exit 1
esac
diff --git a/recipes/ti/matrix-gui-e/init b/recipes/ti/matrix-gui-e/init
index 8259417..8a1c77e 100755
--- a/recipes/ti/matrix-gui-e/init
+++ b/recipes/ti/matrix-gui-e/init
@@ -1,6 +1,6 @@
#! /bin/sh
-matrixgui="/usr/bin/matrix_gui"
+matrixgui="/usr/bin/matrix_guiE"
GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
test -x "$matrixgui" || exit 0
@@ -16,16 +16,16 @@ case "$1" in
echo "."
fi
echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
+ start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
echo "."
;;
stop)
echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
echo "."
;;
*)
- echo "Usage: /etc/init.d/matrix-gui {start|stop}"
+ echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
exit 1
esac
diff --git a/recipes/ti/matrix-gui-e_svn.bb b/recipes/ti/matrix-gui-e_svn.bb
index 79f5d24..38846fe 100644
--- a/recipes/ti/matrix-gui-e_svn.bb
+++ b/recipes/ti/matrix-gui-e_svn.bb
@@ -1,12 +1,12 @@
-DESCRIPTION = "Matrix GUI"
+DESCRIPTION = "Matrix GUI for Qt Embedded"
HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
LICENSE = "BSD"
SECTION = "multimedia"
PRIORITY = "optional"
-SRCREV = "57"
+SRCREV = "58"
PV = "1.0"
-PR = "r6+svnr${SRCPV}"
+PR = "r7+svnr${SRCPV}"
SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
file://init \
@@ -14,7 +14,7 @@ SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=ano
S = "${WORKDIR}/trunk"
-INITSCRIPT_NAME = "matrix-gui"
+INITSCRIPT_NAME = "matrix-gui-e"
INITSCRIPT_PARAMS = "defaults 99"
inherit qt4e update-rc.d
@@ -37,7 +37,7 @@ MATRIX_EXTRA_BINS = " \
do_install() {
install -d ${D}/${bindir}
- install -m 0755 ${S}/matrix_gui ${D}/${bindir}
+ install -m 0755 ${S}/matrix_gui ${D}/${bindir}/matrix_guiE
for i in ${MATRIX_EXTRA_BINS}; do
install -m 0755 ${S}/bin/${i} ${D}/${bindir}
done
@@ -46,7 +46,7 @@ do_install() {
install -d ${D}/${datadir}/matrix/images
install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
install -d ${D}${sysconfdir}/init.d/
- install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
+ install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-e
}
RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib"