aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2014-10-17 14:41:16 +0300
committerHolger Behrens <holger.behrens@windriver.com>2014-10-17 17:29:18 +0200
commita74f1c860232f5ef4a5e9b797daf15e72f641d02 (patch)
tree0ea71c02933285044fc98d5d4535bc3df48be6c9
parent4e3fe333e3873eba59ef2cd38c60466d95ed4e18 (diff)
downloadmeta-ivi-a74f1c860232f5ef4a5e9b797daf15e72f641d02.tar.gz
meta-ivi-a74f1c860232f5ef4a5e9b797daf15e72f641d02.tar.bz2
meta-ivi-a74f1c860232f5ef4a5e9b797daf15e72f641d02.zip
weston: Add start-up scripts for AM and browser PoC's
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
-rwxr-xr-xmeta-ivi-demo/recipes-graphics/wayland/weston/start_am-poc.sh2
-rwxr-xr-xmeta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh5
-rw-r--r--meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch2
-rw-r--r--meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend2
4 files changed, 6 insertions, 5 deletions
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/start_am-poc.sh b/meta-ivi-demo/recipes-graphics/wayland/weston/start_am-poc.sh
new file mode 100755
index 0000000..be6b299
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/start_am-poc.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+/bin/systemctl start --user AudioManager-PoC
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh b/meta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh
index 4e76ac2..baaa70f 100755
--- a/meta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh
@@ -1,5 +1,2 @@
#! /bin/sh
-
-export `dbus-launch`
-/opt/browser/bin/browser&
-/opt/demoui/bin/demoui
+/bin/systemctl start --user demoui
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch b/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch
index cb2b6b7..93c1fdc 100644
--- a/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch
@@ -26,7 +26,7 @@ Index: weston-1.5.0/ivi-shell/weston.ini.in
-icon=@abs_top_builddir@/data/icon_ivi_clickdot.png
-path=@abs_top_builddir@/clients/weston-clickdot
+icon=@abs_top_builddir@/data/GDP_AM_Button.png
-+path=@abs_top_builddir@/clients/am-poc/start_am-poc.sh
++path=@abs_top_builddir@/clients/start_am-poc.sh
[ivi-launcher]
workspace-id=1
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend
index 75f7dff..472b187 100644
--- a/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston_1.5.0.bbappend
@@ -5,6 +5,7 @@ SRC_URI_append = " file://weston_ini.patch \
file://GDP_AM_Button.png \
file://GDP_Background.png \
file://GDP_Browser_Button.png \
+ file://start_am-poc.sh \
file://start_browser-poc.sh \
file://browser_poc_hack.patch \
"
@@ -12,6 +13,7 @@ SRC_URI_append = " file://weston_ini.patch \
do_install_append() {
install -m644 ${WORKDIR}/GDP*.png ${D}/usr/share/weston
mkdir -p ${D}/${bindir}/
+ cp ${WORKDIR}/start_am-poc.sh ${D}/${bindir}
cp ${WORKDIR}/start_browser-poc.sh ${D}/${bindir}
mkdir -p ${D}/lib/systemd/system/
cp ${WORKDIR}/weston.service ${D}/lib/systemd/system/