[oe-commits] org.oe.oz354x machine configs: moved wpa-supplicant to poodle/zaurus-clamshell so collie does not get it

[hrw commit]

machine configs: moved wpa-supplicant to poodle/zaurus-clamshell so collie does not get it

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 4ed3d94fcab37b8049cce52fe43e68079f6aed74
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ed3d94fcab37b8049cce52fe43e68079f6aed74
Files:
1
conf/machine/handheld-common.conf
conf/machine/poodle-2.6.conf
conf/machine/zaurus-clamshell-2.6.conf
Diffs:

#
# mt diff -r6f64da16bca2a018947687733daea08b9ff6c0e3 -r4ed3d94fcab37b8049cce52fe43e68079f6aed74
#
# 
# 
# patch "conf/machine/handheld-common.conf"
#  from [30af408f5e1b8bd3053a9cf3bfeba8a2a1ed8df2]
#    to [4e577a4b3bdee7ea201b76b7d7030c903dff73af]
# 
# patch "conf/machine/poodle-2.6.conf"
#  from [cc5f367991f75c99ca81e7b0986b0db1ce5dc874]
#    to [53708f90d1962f25c30795ab2f09985eccf1546d]
# 
# patch "conf/machine/zaurus-clamshell-2.6.conf"
#  from [d379279f3dd692821d1d253cf55244c1149fd01c]
#    to [f81234bfb53e6b0b7ff624cfca21258b7844df7b]
# 
============================================================
--- conf/machine/handheld-common.conf	30af408f5e1b8bd3053a9cf3bfeba8a2a1ed8df2
+++ conf/machine/handheld-common.conf	4e577a4b3bdee7ea201b76b7d7030c903dff73af
@@ -18,8 +18,8 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils  wpa-supplicant lrzsz ppp-dialin scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils lrzsz ppp-dialin scap network-suspend-scripts"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
============================================================
--- conf/machine/poodle-2.6.conf	cc5f367991f75c99ca81e7b0986b0db1ce5dc874
+++ conf/machine/poodle-2.6.conf	53708f90d1962f25c30795ab2f09985eccf1546d
@@ -1,8 +1,8 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kerne
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral \
-			   alsa-utils alsa-settings"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils udev-utils \
+			   alsa-utils alsa-settings wpa-supplicant"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils udev-utils wpa-supplicant \
 			    alsa-utils-alsactl alsa-utils-alsamixer alsa-conf alsa-settings"
 
 # Sound Modules
============================================================
--- conf/machine/zaurus-clamshell-2.6.conf	d379279f3dd692821d1d253cf55244c1149fd01c
+++ conf/machine/zaurus-clamshell-2.6.conf	f81234bfb53e6b0b7ff624cfca21258b7844df7b
@@ -5,12 +5,12 @@ hostap-utils prism3-firmware prism3-supp
 
 BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \
 hostap-utils prism3-firmware prism3-support zaurusd alsa-lib alsa-utils \
-hostap-conf orinoco-conf module-init-tools altboot"
+hostap-conf orinoco-conf module-init-tools altboot wpa-supplicant"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 udev-utils hostap-utils prism3-firmware prism3-support zaurusd \
 alsa-conf alsa-utils-alsamixer alsa-utils-alsactl hostap-conf orinoco-conf \
-module-init-tools altboot"
+module-init-tools altboot wpa-supplicant"
 
 #BOOTSTRAP_EXTRA_RDEPENDS += " \
 #pcmcia-cs apm  wireless-tools irda-utils console-tools \