summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-07-04 08:56:20 +0000
committerRoss Burton <ross@openedhand.com>2008-07-04 08:56:20 +0000
commit62cf617a41835c013b324d2ad8b61878f3a94e4b (patch)
tree4d21f89f60af58d46f3533693dabaadcb209b0e8 /meta
parent0504f934585cf06c1f572b048c45bee4bcc92715 (diff)
downloadopenembedded-core-62cf617a41835c013b324d2ad8b61878f3a94e4b.tar.gz
openembedded-core-62cf617a41835c013b324d2ad8b61878f3a94e4b.tar.bz2
openembedded-core-62cf617a41835c013b324d2ad8b61878f3a94e4b.zip
settings-daemon: use a .sh session script
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4813 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--[-rwxr-xr-x]meta/packages/settings-daemon/files/70settings-daemon.sh (renamed from meta/packages/settings-daemon/files/70settings-daemon)2
-rw-r--r--meta/packages/settings-daemon/settings-daemon_svn.bb6
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/packages/settings-daemon/files/70settings-daemon b/meta/packages/settings-daemon/files/70settings-daemon.sh
index e687dabe4b..95374135f2 100755..100644
--- a/meta/packages/settings-daemon/files/70settings-daemon
+++ b/meta/packages/settings-daemon/files/70settings-daemon.sh
@@ -1,3 +1 @@
-#!/bin/sh
-
/usr/bin/settings-daemon &
diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/packages/settings-daemon/settings-daemon_svn.bb
index fd9f856770..b4be316afd 100644
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/packages/settings-daemon/settings-daemon_svn.bb
@@ -4,10 +4,10 @@ DEPENDS = "gconf glib-2.0 gtk+"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
- file://70settings-daemon"
+ file://70settings-daemon.sh"
S = "${WORKDIR}/${PN}"
@@ -17,5 +17,5 @@ FILES_${PN} = "${bindir}/* ${sysconfdir}"
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d
- install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
+ install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/
}