summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-04 08:30:46 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-04 08:30:46 +0100
commit80739fde7f5be56aae0b5981ce50cfe21ff94113 (patch)
tree1ef5fe05d94a26d13007d30bcff5d4c9a7ce12a1 /recipes
parent49d5f70658ab0386bee5869656d0405a6d416e35 (diff)
Revert Introduce DISTRO_apm patch until I get permission
* This was committed accidentally * This reverts commit 49d5f70658ab0386bee5869656d0405a6d416e35.
Diffstat (limited to 'recipes')
-rw-r--r--recipes/ipaq-sleep/ipaq-sleep_0.9.bb5
-rw-r--r--recipes/matchbox2/matchbox-panel-2_svn.bb6
-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, 10 insertions, 19 deletions
diff --git a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
index 6c37b73e8e..24d881dd05 100644
--- a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Automatic sleep/suspend control daemon"
SECTION = "x11/base"
LICENSE = "GPL"
DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
-DISTRO_apm ?= "apm"
-RDEPENDS = "${DISTRO_apm}"
-PR = "r7"
+RDEPENDS = "apm"
+PR = "r6"
inherit gpe pkgconfig
diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb
index 9d1781baa6..a2a807f28a 100644
--- a/recipes/matchbox2/matchbox-panel-2_svn.bb
+++ b/recipes/matchbox2/matchbox-panel-2_svn.bb
@@ -1,15 +1,13 @@
DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
LICENSE = "GPLv2"
SECTION = "x11/panels"
-
-DISTRO_apm ?= "apm"
DEPENDS = "gtk+ startup-notification dbus dbus-glib matchbox-panel-2-icon-themes"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
-DEPENDS += " ${@base_contains("MACHINE_FEATURES", "${DISTRO_apm}", "apmd", "",d)}"
+DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
RDEPENDS_${PN} = "matchbox-panel-2-icon-theme"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PV = "2.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r0"
inherit autotools_stage pkgconfig
diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb
index 14858a7231..aeeee871b3 100644
--- a/recipes/openmoko2/neod_svn.bb
+++ b/recipes/openmoko2/neod_svn.bb
@@ -1,11 +1,9 @@
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 ${DISTRO_apm} dbus"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
PV = "0.1.0+svnr${SRCPV}"
-PR = "r7"
+PR = "r6"
inherit openmoko2 gconf
diff --git a/recipes/suspend-desktop/suspend-desktop_1.0.bb b/recipes/suspend-desktop/suspend-desktop_1.0.bb
index 8fcdfea08d..fa9efba84b 100644
--- a/recipes/suspend-desktop/suspend-desktop_1.0.bb
+++ b/recipes/suspend-desktop/suspend-desktop_1.0.bb
@@ -3,11 +3,10 @@ PRIORITY = "optional"
DESCRIPTION = "Suspend feature for the application launcher menu."
LICENSE = "GPL"
-PR = "r2"
+PR = "r1"
-DISTRO-apm ?= "apm"
RDEPENDS = "gpe-conf"
-RRECOMMENDS = "${DISTRO_apm}"
+RRECOMMENDS = "apm"
PACKAGES = "${PN}"
PACKAGE_ARCH = "all"
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index 6aad8730e2..ed561b802e 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 = "r87"
+PR = "r86"
inherit task
@@ -60,9 +60,6 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug",""
#
DISTRO_SSH_DAEMON ?= "dropbear"
-# Distro can override apm provider
-DISTRO_apm ?= "apm"
-
#
# bluetooth manager
#
@@ -193,7 +190,7 @@ RDEPENDS_task-base-acpi = "\
acpid"
RDEPENDS_task-base-apm = "\
- "${DISTRO_apm}" \
+ apm \
apmd \
${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"