omnewrotate: update Xsession.d script for xserver-common

* don't source default/omnewrotate config to Xsession shell
* don't export DISPLAY (it should be exported before running Xsession scripts)
* move autostart logic to init.d script

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/omnewrotate/files/xsession.script.patch b/recipes/omnewrotate/files/xsession.script.patch
new file mode 100644 (file)
index 0000000..eb1412e
--- /dev/null
+++ b/recipes/omnewrotate/files/xsession.script.patch
@@ -0,0 +1,35 @@
+Index: omnewrotate.orig/data/omnewrotate.in
+===================================================================
+--- omnewrotate.orig/data/omnewrotate.in       (revision 66)
++++ omnewrotate/data/omnewrotate.in    (working copy)
+@@ -4,10 +4,14 @@
+       . @SYSCONFDIR@/default/omnewrotate.conf
+ fi
+ 
+-export DIPLAY=:0
+ PIDFILE="/var/run/omnewrotate.pid"
+ 
+ case "$1" in
++      autostart)
++              if test "$START" == "yes" ; then
++                      $0 start
++              fi
++      ;;
+       start)
+               echo -n starting omnewrotate...
+               /sbin/start-stop-daemon -S \
+Index: omnewrotate.orig/data/89omnewrotate.in
+===================================================================
+--- omnewrotate.orig/data/89omnewrotate.in     (revision 66)
++++ omnewrotate/data/89omnewrotate.in  (working copy)
+@@ -1,9 +1,3 @@
+ #!/bin/sh
+ 
+-if [ -f @CONFIGDIR@/omnewrotate.conf ] ; then
+-      . @CONFIGDIR@/omnewrotate.conf
+-fi
+-
+-if test "$START" == "yes" ; then
+-      exec @SYSCONFDIR@/init.d/omnewrotate start
+-fi
++@SYSCONFDIR@/init.d/omnewrotate autostart

diff --git a/recipes/omnewrotate/omnewrotate_svn.bb b/recipes/omnewrotate/omnewrotate_svn.bb
index 410d12f..74d1585 100644 (file)
--- a/recipes/omnewrotate/omnewrotate_svn.bb
+++ b/recipes/omnewrotate/omnewrotate_svn.bb
@@ -8,9 +8,10 @@ DEPENDS = "libframeworkd-glib xrandr"
 SRCREV = "66"
 
 PV = "0.5.8+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "svn://omnewrotate.googlecode.com/svn;module=trunk;proto=http"
+SRC_URI = "svn://omnewrotate.googlecode.com/svn;module=trunk;proto=http \
+           file://xsession.script.patch;patch=1"
 
 S = "${WORKDIR}/trunk"