summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-11-16 16:18:38 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-11-16 16:18:38 +0000
commit0ef4b5c5b4ae1de2eaff7120bc332e31110a777c (patch)
tree842b89f6ce6fb53165109fb0712d380369955106
parent60010adcb9203f278f8984e7b82d5671a1c08b08 (diff)
parent8bf214c9b0fdaa68134bb81c39f854ed51a4de56 (diff)
merge of '3b9fd83e9698bae081197909b331c676eba025fd'
and 'a34feb8c5cd32b70487440b494c3f223e50b122d'
-rw-r--r--packages/openmoko2/openmoko-session2.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 66ce5da82a..a8768534b1 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r61"
+PR = "r62"
SRC_URI = "\
file://etc \
@@ -12,6 +12,13 @@ SRC_URI = "\
"
S = ${WORKDIR}
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "11"
+
do_install() {
install -d ${D}${bindir}
install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}