8 files changed, 68 insertions, 18 deletions
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_AM_Button.png b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_AM_Button.png
new file mode 100644
index 0000000..82f9ba7
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_AM_Button.png
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Background.png b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Background.png
new file mode 100644
index 0000000..0934908
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Background.png
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Browser_Button.png b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Browser_Button.png
new file mode 100644
index 0000000..174a0f7
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/GDP_Browser_Button.png
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
new file mode 100755
index 0000000..4e76ac2
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/start_browser-poc.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+export `dbus-launch`
+/opt/browser/bin/browser&
+/opt/demoui/bin/demoui
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/weston.service b/meta-ivi-demo/recipes-graphics/wayland/weston/weston.service
new file mode 100644
index 0000000..c8aafb5
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/weston.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Weston service
+After=dbus.service
+
+[Service]
+ExecStart=/usr/bin/weston-launch -u root
+ExecStop=/usr/bin/killall -s KILL weston
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch b/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch
new file mode 100644
index 0000000..e667927
--- /dev/null
+++ b/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini.patch
@@ -0,0 +1,32 @@
+Index: weston-1.5.0/ivi-shell/weston.ini.in
+===================================================================
+--- weston-1.5.0.orig/ivi-shell/weston.ini.in	2014-10-06 13:10:31.972155915 +0300
++++ weston-1.5.0/ivi-shell/weston.ini.in	2014-10-06 13:14:32.180148892 +0300
+@@ -13,7 +13,7 @@
+ workspace-layer-id=3000
+ application-layer-id=4000
+ 
+-background-image=@abs_top_builddir@/data/background.png
++background-image=@abs_top_builddir@/data/GDP_Background.png
+ background-id=1001
+ panel-image=@abs_top_builddir@/data/panel.png
+ panel-id=1002
+@@ -33,14 +33,14 @@
+ [ivi-launcher]
+ workspace-id=0
+ icon-id=4001
+-icon=@abs_top_builddir@/data/icon_ivi_flower.png
+-path=@abs_top_builddir@/clients/weston-flower
++icon=@abs_top_builddir@/data/GDP_Browser_Button.png
++path=@abs_top_builddir@/clients/start_browser-poc.sh
+ 
+ [ivi-launcher]
+ workspace-id=0
+ icon-id=4002
+-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/falcon_hmi
+ 
+ [ivi-launcher]
+ workspace-id=1
diff --git a/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini_add_xwayland_module.patch b/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini_add_xwayland_module.patch
deleted file mode 100644
index 7ad44b6..0000000
--- a/meta-ivi-demo/recipes-graphics/wayland/weston/weston_ini_add_xwayland_module.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: weston-1.5.0/weston.ini.in
-===================================================================
---- weston-1.5.0.orig/weston.ini.in	2014-05-20 02:00:51.000000000 +0300
-+++ weston-1.5.0/weston.ini.in	2014-10-02 06:27:25.057799926 +0300
-@@ -1,7 +1,8 @@
- [core]
- #modules=xwayland.so,cms-colord.so
--#shell=desktop-shell.so
--#gbm-format=xrgb2101010
-+modules=xwayland
-+shell=desktop-shell.so
-+gbm-format=xrgb2101010
- 
- [shell]
- background-image=/usr/share/backgrounds/gnome/Aqua.jpg
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 0450ce9..6e60f4a 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
@@ -1,7 +1,24 @@
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 
-SRC_URI_append = "file://weston_ini_add_xwayland_module.patch"
+SRC_URI_append = " file://weston_ini.patch \
+             file://weston.service \
+             file://GDP_AM_Button.png \
+             file://GDP_Background.png \
+             file://GDP_Browser_Button.png \
+             file://start_browser-poc.sh \
+                 "
 
-DEPENDS_append = " libxcursor xcb-util"
+do_install_append() {
+    install -m644 ${WORKDIR}/GDP*.png ${D}/usr/share/weston
+    mkdir -p ${D}/${bindir}/
+    cp ${WORKDIR}/start_browser-poc.sh ${D}/${bindir}
+    mkdir -p ${D}/lib/systemd/system/
+    cp ${WORKDIR}/weston.service ${D}/lib/systemd/system/
+    mkdir -p ${D}/${sysconfdir}/systemd/system/multi-user.target.wants/
+    ln -sf /lib/systemd/system/weston.service ${D}/${sysconfdir}/systemd/system/multi-user.target.wants/weston.service
+}
 
-EXTRA_OECONF_append =" --enable-xwayland --enable-xwayland-test"
+FILES_${PN} += " \
+                /lib/systemd/system/weston.service \
+                /etc/systemd/system/multi-user.target.wants/weston.service \
+               "