diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 02:08:23 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 02:08:23 +0000 |
| commit | 46858d01adf23692e92e456b0d2f8f2f9fe4be45 (patch) | |
| tree | 268c9e49cb77d01ee938476273fe281072e3c1be | |
| parent | 878425ebbfd687f787069e033aa65db93b440a84 (diff) | |
| parent | ac92e9f40ef1289af27e9322b78dd3b37d162bb7 (diff) | |
merge of '178eac00dc5aa8338d42e8e203633bec7817bbf6'
and 'b0ef17921f71badc490ceaad45b8ac8d0b434937'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fc111e03fe..e871e92473 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -142,6 +142,7 @@ SRCREV_pn-opkg-native ?= "4210" SRCREV_pn-opkg-sdk ?= "4209" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" SRCREV_pn-pyneog ?= "88" @@ -149,6 +150,7 @@ SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "127" SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-s3c24xx-gpio ?= "4130" +SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index f9db990e83..26eb6556e1 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,33 +1,31 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2" +RDEPENDS = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r65" +PR = "r66" SRC_URI = "\ file://etc \ file://matchbox-session \ " -S = ${WORKDIR} -inherit update-alternatives +S = "${WORKDIR}" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "11" +inherit update-alternatives 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 - rm -fR ${D}${sysconfdir}/matchbox/.svn - chmod -R 755 ${D}${sysconfdir}/ + 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 + rm -fR ${D}${sysconfdir}/matchbox/.svn + chmod -R 755 ${D}${sysconfdir}/ } +PACKAGE_ARCH = "all" + pkg_postinst_openmoko-session2 () { #!/bin/sh -e if [ "x$D" != "x" ]; then @@ -47,7 +45,9 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire } -PACKAGE_ARCH = "all" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "11" CONFFILES_${PN} = "${sysconfdir}/matchbox/session" - |