summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/shr.conf2
-rw-r--r--recipes/ipaq-sleep/ipaq-sleep_0.9.bb5
-rw-r--r--recipes/openmoko2/neod_svn.bb6
-rw-r--r--recipes/suspend-desktop/suspend-desktop_1.0.bb5
-rw-r--r--recipes/tasks/task-base.bb7
5 files changed, 16 insertions, 9 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 80f89bd5fe..833eb09ab7 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -30,6 +30,7 @@ DISTRO_TYPE = "debug"
DISTRO = "shr"
DISTRO_SSH_DAEMON = "openssh"
+DISTRO_APM = "fso-apm"
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -183,7 +184,6 @@ PREFERRED_PROVIDER_virtual/db-native = "db3-native"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
-DISTRO_apm = "fso-apm"
#############################################################################
# PREFERRED VERSIONS
diff --git a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
index 24d881dd05..158de80bf1 100644
--- a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Automatic sleep/suspend control daemon"
SECTION = "x11/base"
LICENSE = "GPL"
DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
-RDEPENDS = "apm"
-PR = "r6"
+DISTRO_APM ?= "apm"
+RDEPENDS = "${DISTRO_APM}"
+PR = "r7"
inherit gpe pkgconfig
diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb
index aeeee871b3..e57bf08068 100644
--- a/recipes/openmoko2/neod_svn.bb
+++ b/recipes/openmoko2/neod_svn.bb
@@ -1,9 +1,11 @@
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
+
+DISTRO_APM ?= "apm"
DEPENDS = "gtk+ pulseaudio apmd"
-RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_APM} dbus"
PV = "0.1.0+svnr${SRCPV}"
-PR = "r6"
+PR = "r7"
inherit openmoko2 gconf
diff --git a/recipes/suspend-desktop/suspend-desktop_1.0.bb b/recipes/suspend-desktop/suspend-desktop_1.0.bb
index fa9efba84b..085d686aa1 100644
--- a/recipes/suspend-desktop/suspend-desktop_1.0.bb
+++ b/recipes/suspend-desktop/suspend-desktop_1.0.bb
@@ -3,10 +3,11 @@ PRIORITY = "optional"
DESCRIPTION = "Suspend feature for the application launcher menu."
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+DISTRO_APM ?= "apm"
RDEPENDS = "gpe-conf"
-RRECOMMENDS = "apm"
+RRECOMMENDS = "${DISTRO_APM}"
PACKAGES = "${PN}"
PACKAGE_ARCH = "all"
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index ed561b802e..b540c80bda 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r86"
+PR = "r87"
inherit task
@@ -60,6 +60,9 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug",""
#
DISTRO_SSH_DAEMON ?= "dropbear"
+# Distro can override apm provider
+DISTRO_APM ?= "apm"
+
#
# bluetooth manager
#
@@ -190,7 +193,7 @@ RDEPENDS_task-base-acpi = "\
acpid"
RDEPENDS_task-base-apm = "\
- apm \
+ "${DISTRO_APM}" \
apmd \
${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"