diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
| commit | 7bcf4828673040af5022534981de6416f5884cff (patch) | |
| tree | 18ab00a9b6f1ce29fa7b613662e256785fb59781 /packages/openmoko2/openmoko-session2.bb | |
| parent | 84b2b31930881004a73267cf24fe6fe701e0f8a8 (diff) | |
| parent | 78c32ad25a3883dc7a127a36673890225f9f54f2 (diff) | |
propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)
to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)
Diffstat (limited to 'packages/openmoko2/openmoko-session2.bb')
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index b71d35528d..3d8c9109e1 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,15 +1,27 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" +RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" -RCONFLICTS = "openmoko-session" -PR = "r37" +RCONFLICTS_${PN} = "openmoko-session matchbox-common" +PR = "r63" -SRC_URI = "file://etc" +SRC_URI = "\ + file://etc \ + file://matchbox-session \ +" 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} install -d ${D}${sysconfdir} cp -R ${S}/etc/* ${D}${sysconfdir} rm -fR ${D}${sysconfdir}/.svn |