summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-09-02 23:37:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-02 23:37:00 +0000
commitd926c884b211cb6b1daa15bd99d5b68f8d39a7c9 (patch)
tree6b60cb323fd226c5ee1d87c2d8daa322cb098ef4
parent98c4ffd492b19495c5cd58d6106fd927bf68f638 (diff)
entrance: run entrance from entrance_wrapper instead of from Xinit to fix login issues
-rw-r--r--packages/e17/entrance/Xinit.d/.mtn2git_empty0
-rw-r--r--packages/e17/entrance/Xinit.d/99entrance4
-rw-r--r--packages/e17/entrance/run-Xinit.patch2
-rw-r--r--packages/e17/entrance_20050810.bb2
4 files changed, 2 insertions, 6 deletions
diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/e17/entrance/Xinit.d/.mtn2git_empty
+++ /dev/null
diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
deleted file mode 100644
index e524443ec9..0000000000
--- a/packages/e17/entrance/Xinit.d/99entrance
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec entrance
-
diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
index 52eaae3984..1d6c2307f7 100644
--- a/packages/e17/entrance/run-Xinit.patch
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -8,7 +8,7 @@
+ chmod -x /etc/X11/Xinit.d/99gpe-login
+fi
+
-+exec /etc/X11/Xinit
++/etc/X11/Xinit
+
exec @prefix@/bin/entrance "$@"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 6f9c2f1267..c478452961 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -7,7 +7,7 @@ RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
CVSDATE = "${PV}"
-PR = "r8"
+PR = "r9"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
file://Xserver.patch;patch=1 \