summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-03 21:42:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-03 22:05:37 +0200
commit653df48c2da367e7389ed61cff6c71dc759c9543 (patch)
tree89837ba7298922c722cd3b5f7a4d72e2015f1b9f /recipes
parent5c6e5812f3b638e435a5432c8ad5e04ca0bb0d92 (diff)
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>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/omnewrotate/files/xsession.script.patch35
-rw-r--r--recipes/omnewrotate/omnewrotate_svn.bb5
2 files changed, 38 insertions, 2 deletions
diff --git a/recipes/omnewrotate/files/xsession.script.patch b/recipes/omnewrotate/files/xsession.script.patch
new file mode 100644
index 0000000000..eb1412e458
--- /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 410d12f6a8..74d158576e 100644
--- 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"