summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-19 21:53:15 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-19 21:53:15 +0000
commit210f0111454206730a5f4ed8eb799bfc59485708 (patch)
tree667713c7e84a7fbdcc0c54ce6a9cee93813ada7a
parent76b5863170eebf5ea61fcbf79eb963d4c9092352 (diff)
downloadopenembedded-core-210f0111454206730a5f4ed8eb799bfc59485708.tar.gz
openembedded-core-210f0111454206730a5f4ed8eb799bfc59485708.tar.bz2
openembedded-core-210f0111454206730a5f4ed8eb799bfc59485708.tar.xz
openembedded-core-210f0111454206730a5f4ed8eb799bfc59485708.zip
networkmanager/matchbox-keyboard: Use exec to run the final programs
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5084 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg2
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb2
-rw-r--r--meta/packages/networkmanager/files/70NetworkManagerApplet.shbg2
-rw-r--r--meta/packages/networkmanager/networkmanager-applet_svn.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
index e6745c569..43c5d3ed6 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
@@ -19,5 +19,5 @@ if [ "$CMD" ]; then
# Delay to make sure the window manager is active
# by waiting for the desktop to say its finished loading
dbus-wait org.matchbox_project.desktop Loaded
- $CMD
+ exec $CMD
fi
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 7afe8eb60..568a83e51 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
RDEPENDS = "formfactor dbus-wait"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://configure_fix.patch;patch=1;maxrev=1819 \
diff --git a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
index 55248ede9..8858b3e7c 100644
--- a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
+++ b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
@@ -1,4 +1,4 @@
#!/bin/sh
# Wait for the desktop to say its finished loading
dbus-wait org.matchbox_project.desktop Loaded
-/usr/bin/nm-applet
+exec /usr/bin/nm-applet
diff --git a/meta/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
index 6473fc9e6..27108d282 100644
--- a/meta/packages/networkmanager/networkmanager-applet_svn.bb
+++ b/meta/packages/networkmanager/networkmanager-applet_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
#TODO DEPENDS libnotify
RDEPENDS = "networkmanager dbus-wait"
-PR = "r6"
+PR = "r7"
inherit gnome gtk-icon-cache