summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-10-08 15:25:01 +0000
committerRoss Burton <ross@openedhand.com>2008-10-08 15:25:01 +0000
commit986e49c43bce4539e0847b2232eb91a649af291b (patch)
treec5a5e493c581c67afc846c2e4efb6d0f474a1f8d
parent2452ba4aa73050a955d1213d88b42018dab888a9 (diff)
downloadopenembedded-core-986e49c43bce4539e0847b2232eb91a649af291b.tar.gz
openembedded-core-986e49c43bce4539e0847b2232eb91a649af291b.tar.bz2
openembedded-core-986e49c43bce4539e0847b2232eb91a649af291b.tar.xz
openembedded-core-986e49c43bce4539e0847b2232eb91a649af291b.zip
matchbox-panel: enable the relevant battery plugin depending on the machine features
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5462 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
index 4dfd81b24..cf2370165 100644
--- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -1,8 +1,11 @@
LICENSE = "GPLv2"
PRIORITY = "optional"
-DEPENDS = "gtk+ startup-notification apmd dbus dbus-glib"
+DEPENDS = "gtk+ startup-notification dbus dbus-glib"
+DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
+DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
+
PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
@@ -11,6 +14,8 @@ RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
+EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
+EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
S = "${WORKDIR}/${PN}"