From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 23 Aug 2006 13:42:41 +0000 (+0000)
Subject: merge of '06b0b9044cf254cee3054b4f66aaa84dbd8e1677'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08f4e0f4a61aff70d519cfdd058e6026c202ca8;p=openembedded.git

Merge ... '06b0b9044cf254cee3054b4f66aaa84dbd8e1677'
     and '60e64ed985c2acb38ef2901d7b6a52073016964d'
---

f08f4e0f4a61aff70d519cfdd058e6026c202ca8
diff --cc packages/angstrom/task-angstrom.bb
index 79f6c4752e,249448652a..9f31f0b640
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@@ -37,31 -37,29 +37,31 @@@ RDEPENDS_angstrom-base-depends_append_h
  RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware "
  
  RRECOMMENDS_angstrom-base-depends = "\
 -        ${BOOTMODULES_RRECOMMENDS} \
 -	kernel-module-evdev \
 -	kernel-module-uinput \
 -	kernel-module-g-ether \
 -	kernel-module-hostap-cs \
 -	kernel-module-af-packet \
 -	"
 +    ${BOOTMODULES_RRECOMMENDS} \
 +    kernel-module-evdev \
 +    kernel-module-uinput \
 +    kernel-module-g-ether \
 +    kernel-module-af-packet \
 +"
  
  RDEPENDS_angstrom-base-wifi = "\
 -    	hostap-utils \
 -    	hostap-conf \
 -    	prism3-support \
 -    	prism3-firmware \
 -    	wireless-tools \
 -    	wpa-supplicant \
 -	"
 +    hostap-utils \
 +    hostap-conf \
 +    prism3-support \
 +    prism3-firmware \
 +    wireless-tools \
 +    wpa-supplicant \
-     "
++"
  
  RRECOMMENDS_angstrom-base-wifi = "\
 - 	kernel-module-arc4 \
 -	kernel-module-michael-mic \
 -	kernel-module-aes \
 -	kernel-module-ieee80211-crypt-tkip \
 -	kernel-module-ieee80211-crypt-wep \
 -	kernel-module-ieee80211-crypt \
 -	kernel-module-ieee80211-crypt-ccmp \
 -	"
 +    kernel-module-hostap-cs \
 +    kernel-module-orinoco-cs \
 +    kernel-module-spectrum-cs \
 +    kernel-module-arc4 \
 +    kernel-module-michael-mic \
 +    kernel-module-aes \
 +    kernel-module-ieee80211-crypt-tkip \
 +    kernel-module-ieee80211-crypt-wep \
 +    kernel-module-ieee80211-crypt \
 +    kernel-module-ieee80211-crypt-ccmp \
 +"