summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-02-09 19:26:07 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-09 19:26:07 +0000
commit099ef9cc1983cc64708e73c29f85d6319f8fe417 (patch)
tree116c42ce97202db7cf7abba87203b8b7e925b6c4
parent314af3a6a4f1b496a23e7f640c9bfe7463079e03 (diff)
entrance: Do no longer install initscript into /etc/init.d but use "login-manager" to be launched.
-rw-r--r--packages/e17/e-wm_0.16.999.023.bb2
-rw-r--r--packages/e17/entrance_0.9.0.005.bb13
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/e17/e-wm_0.16.999.023.bb b/packages/e17/e-wm_0.16.999.023.bb
index 8bca19b616..f7f61ef747 100644
--- a/packages/e17/e-wm_0.16.999.023.bb
+++ b/packages/e17/e-wm_0.16.999.023.bb
@@ -9,12 +9,14 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz
file://fix-configure.patch;patch=1 \
file://remove-large-fonts.patch;patch=1 \
file://Xsession.d/98enlightenment"
+
# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
# file://disable-splash.patch;patch=1 \
# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1"
+
S = "${WORKDIR}/enlightenment-${PV}"
diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.005.bb
index 1f3a46e2d8..c17d52c587 100644
--- a/packages/e17/entrance_0.9.0.005.bb
+++ b/packages/e17/entrance_0.9.0.005.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Entrance is the Enlightenment login manager"
SECTION = "e/apps"
LICENSE = "MIT"
# can also use pam and crypt
-DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common"
-RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
+DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common login-manager"
+RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager"
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-PR = "r11"
+PR = "r13"
SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \
file://config-db.patch;patch=1 \
@@ -19,10 +19,7 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \
S = "${WORKDIR}/entrance-${PV}"
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "entrance"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+inherit autotools
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
--with-xsession=/etc/X11/Xsession \
@@ -37,5 +34,5 @@ do_install_append() {
install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
install -d ${D}/etc/X11/login-managers/
- mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
+ mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
}