Fix for TIVI-2932 - Modello will now start automatically at boot.

It also sets up the weston.ini file to work with it and disables
VGA.  Upon deletion of the package all settings will be restored
to their previous state.

Change-Id: Id6aca67eb1b6c4ecbc3561f1c1b41285eb4a5c69
Signed-off-by: brianjjones <brian.j.jones@intel.com>

diff --git a/Makefile b/Makefile
index 9e18287..b627d16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,18 @@ wgtPkg:
 install:
        @echo "Installing Homescreen, stand by..."
        mkdir -p $(INSTALL_DIR)/
+       mkdir -p ${DESTDIR}/usr/bin
+       mkdir -p ${DESTDIR}/usr/lib/systemd/user
+       mkdir -p ${DESTDIR}/etc/xdg/weston/
+       mkdir -p ${DESTDIR}/usr/lib/systemd/user/weston.target.wants/
+       mkdir -p ${DESTDIR}/boot/loader/entries/
        cp $(PROJECT).wgt $(INSTALL_DIR)/
+       install -m 755 systemd/modello_launcher.sh ${DESTDIR}/usr/bin
+       install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path ${DESTDIR}/usr/lib/systemd/user
+       install -m 0644 systemd/Modello_Homescreen.service ${DESTDIR}/usr/lib/systemd/user
+       ln -sf systemd/Modello_Homescreen-launchpad-ready.path ${DESTDIR}/usr/lib/systemd/user/weston.target.wants/
+       install -m 0644 systemd/weston.ini.new ${DESTDIR}/etc/xdg/weston/
+       install -m 0644 systemd/vmlinuz-3.13.3-3.2-x86-ivi.conf.new ${DESTDIR}/boot/loader/entries/
 
 dist:
        tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index fa23546..f0a10a7 100644 (file)
--- a/packaging/modello-homescreen.changes
+++ b/packaging/modello-homescreen.changes
@@ -1,3 +1,8 @@
+* Mon Apr 21 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140417.163457@7c31faa
+- Fix for TIVI-2932 - Modello will now start automatically at boot.  It also sets up the
+  weston.ini file to work with it and disables VGA.  Upon deletion of the package all
+  settings will be restored to their previous state.
+
 * Wed Apr 16 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140416.223008@796ffc4
 - Fixes TIVI-3004.  Now center pie buttons will launch their apps
 

diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 2617660..3e72fa9 100644 (file)
--- a/packaging/modello-homescreen.spec
+++ b/packaging/modello-homescreen.spec
@@ -1,6 +1,6 @@
 Name:       Modello_Homescreen
 Summary:    A proof of concept pure html5 UI
-Version:    0.0.1
+Version:    0.0.2
 Release:    1
 Group:      Applications/System
 License:    Apache 2.0
@@ -27,13 +27,34 @@ rm -rf %{buildroot}
 %make_install
 
 %post
-    wrt-installer -i /opt/usr/apps/.preinstallWidgets/html5UIHomescreen.wgt;
+    wrt-installer -i /opt/usr/apps/.preinstallWidgets/html5UIHomescreen.wgt
     cp -r /opt/usr/apps/_common/js/services /opt/usr/apps/html5POC05/res/wgt/js/
     cp -r /opt/usr/apps/_common/css/* /opt/usr/apps/html5POC05/res/wgt/css/
 
+    if [ ! -f /etc/xdg/weston/weston.ini.orig ] ; then \
+       mv /etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini.orig; \
+    fi;
+
+    if [ ! -f /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf.orig ] ; then \
+       mv /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf.orig; \
+    fi;
+
+    cp /etc/xdg/weston/weston.ini.new /etc/xdg/weston/weston.ini
+    cp /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf.new /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf
+
 %postun
     wrt-installer -un html5POC05.Homescreen
+    rm /etc/xdg/weston/weston.ini
+    mv /etc/xdg/weston/weston.ini.orig /etc/xdg/weston/weston.ini
+    rm /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf
+    mv /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf.orig /boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf
 
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/.preinstallWidgets/html5UIHomescreen.wgt
+/usr/lib/systemd/user/Modello_Homescreen.service
+/usr/lib/systemd/user/Modello_Homescreen-launchpad-ready.path
+/usr/bin/modello_launcher.sh
+/etc/xdg/weston/weston.ini.new
+/boot/loader/entries/vmlinuz-3.13.3-3.2-x86-ivi.conf.new
+/usr/lib/systemd/user/weston.target.wants

diff --git a/systemd/Modello_Homescreen-launchpad-ready.path b/systemd/Modello_Homescreen-launchpad-ready.path
new file mode 100644 (file)
index 0000000..70d3a96
--- /dev/null
+++ b/systemd/Modello_Homescreen-launchpad-ready.path
@@ -0,0 +1,8 @@
+# Description=Path activation for Modello_Homescreen
+
+[Path]
+PathExists=/run/user/%U/wayland-0
+Unit=Modello_Homescreen.service
+
+[Install]
+WantedBy=weston.target

diff --git a/systemd/Modello_Homescreen.service b/systemd/Modello_Homescreen.service
new file mode 100644 (file)
index 0000000..4a94f3a
--- /dev/null
+++ b/systemd/Modello_Homescreen.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Modello Homescreen
+Requires=weston.service
+After=weston.service
+
+[Service]
+Environment=TIZEN_PLATFORMLOGGING_MODE=1
+Environment=TIZEN_DLOG_LEVEL=1
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
+ExecStart=/usr/bin/modello_launcher.sh --user app

diff --git a/systemd/modello_launcher.sh b/systemd/modello_launcher.sh
new file mode 100644 (file)
index 0000000..e24bd2b
--- /dev/null
+++ b/systemd/modello_launcher.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+wrt-launcher -s html5POC05.Homescreen

diff --git a/systemd/vmlinuz-3.13.3-3.2-x86-ivi.conf.new b/systemd/vmlinuz-3.13.3-3.2-x86-ivi.conf.new
new file mode 100644 (file)
index 0000000..989d088
--- /dev/null
+++ b/systemd/vmlinuz-3.13.3-3.2-x86-ivi.conf.new
@@ -0,0 +1,5 @@
+# Generated by setup-gummiboot-conf
+title Tizen 3.0.0 (Tizen Next)
+version 3.13.3-3.2-x86-ivi
+efi /vmlinuz-3.13.3-3.2-x86-ivi
+options rootwait rootfstype=ext4 quiet root=PARTUUID=0B2B8AA5-CFC6-43AA-8DF6-BDF90B2D43E5 video=VGA-1:d

diff --git a/systemd/weston.ini.new b/systemd/weston.ini.new
new file mode 100644 (file)
index 0000000..dfbf62f
--- /dev/null
+++ b/systemd/weston.ini.new
@@ -0,0 +1,20 @@
+[core]
+#modules=cms-colord.so
+#shell=desktop-shell.so
+
+[shell]
+background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+background-color=0xff248bd1
+background-type=tile
+panel-color=0xff2a3c4a
+locking=true
+animation=zoom
+startup-animation=fade
+
+[input-method]
+path=/bin/weekeyboard
+
+[output]
+name=DP1
+mode=1280x720
+transform=90