[oe-commits] Sebastian Spaeth : Revert "shr: drop alsa as distro feature, bump task-base PR"

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 8e9f21e7480d6836de0bf6431674775f91f86841
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8e9f21e7480d6836de0bf6431674775f91f86841

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Mon Apr 19 11:43:21 2010 +0200

Revert "shr: drop alsa as distro feature, bump task-base PR"

This reverts commit 7fd9751f56bff7506f78388b2dfed57e118c1448.

---

 conf/distro/shr.conf       |    2 +-
 recipes/tasks/task-base.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index b96c4ee..b1f1e47 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -100,7 +100,7 @@ ILLUME_THEME = "e-wm-theme-illume-gry"
 # Use bluetooth 4.0
 DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "wifi ppp ext2 vfat bluetooth usbgadget usbhost"
+DISTRO_FEATURES = "wifi ppp alsa ext2 vfat bluetooth usbgadget usbhost"
 # Following features are for ARM and E500 based machines
 DISTRO_FEATURES += "eabi"
 
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index 555a463..8c23aba 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 = "r89"
+PR = "r88"
 
 inherit task