Removing weston / kernel changes. They may cause problems

with different hardware. User needs to set these manually
based on their setup

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

diff --git a/Makefile b/Makefile
index b627d16..3bfa46f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PROJECT = html5UIHomescreen
 
-VERSION := 0.0.1
+VERSION := 0.0.2
 PACKAGE = $(PROJECT)-$(VERSION)
 
 INSTALL_FILES = $(PROJECT).wgt
@@ -12,18 +12,7 @@ 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/
+       install -m 0644 $(PROJECT).wgt $(INSTALL_DIR)/
 
 dist:
        tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index f0a10a7..e890182 100644 (file)
--- a/packaging/modello-homescreen.changes
+++ b/packaging/modello-homescreen.changes
@@ -1,3 +1,7 @@
+* Mon Apr 21 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140421.221822@b9ca10d
+- Removing weston / kernel changes. They may cause problems with different hardware.
+  User needs to set these manually based on their setup
+
 * 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

diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 3e72fa9..065350d 100644 (file)
--- a/packaging/modello-homescreen.spec
+++ b/packaging/modello-homescreen.spec
@@ -23,38 +23,26 @@ A proof of concept pure html5 UI
 make wgtPkg
 
 %install
-rm -rf %{buildroot}
-%make_install
+    %make_install
+    mkdir -p %{buildroot}%{_bindir}
+    mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
+    install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir}
+    install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user
+    install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_libdir}/systemd/user
+    ln -sf systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
 
 %post
     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
+%{_libdir}/systemd/user/Modello_Homescreen.service
+%{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path
+%{_bindir}/modello_launcher.sh
+%{_libdir}/systemd/user/weston.target.wants

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
deleted file mode 100644 (file)
index 989d088..0000000
--- a/systemd/vmlinuz-3.13.3-3.2-x86-ivi.conf.new
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644 (file)
index dfbf62f..0000000
--- a/systemd/weston.ini.new
+++ /dev/null
@@ -1,20 +0,0 @@
-[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