merge of 224863a370e65e88f2bbf71caca6741367900d58

     and 6c6552334af154f24a9b8d53c4589b1601c215fb

5 files changed, 64 insertions, 92 deletions

diff --git a/conf/distro/openzaurus-3.5.4.2.conf b/conf/distro/openzaurus-3.5.4.2.conf
index 2a169a2046..50394d550a 100644
--- a/conf/distro/openzaurus-3.5.4.2.conf
+++ b/conf/distro/openzaurus-3.5.4.2.conf
@@ -24,7 +24,7 @@ machine-upgrades##${FEED_BASE_URI_3542}/feed/upgrades/machine/${MACHINE} \
           python##${FEED_BASE_URI}/feed/python \
             base##${FEED_BASE_URI}/feed/base "
 
-DISTRO_VERSION = "3.5.4.2-rc0"
+DISTRO_VERSION = "3.5.4.2-rc1"
 CVSDATE_zaurusd = "20060507"
 
 ENABLE_BINARY_LOCALE_GENERATION = "1"
@@ -58,12 +58,12 @@ http://www.oesources.org/source/current/"
 
 # add WiFi card config for ALL machines
 
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-conf orinoco-conf oz-bootsplash"
+BOOTSTRAP_EXTRA_RDEPENDS += "hostap-conf orinoco-conf oz-bootsplash altboot "
 BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " usbutils "
 BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " usbutils "
 BOOTSTRAP_EXTRA_RDEPENDS_append_tosa  = " usbutils "
 
-BOOTSTRAP_EXTRA_DEPENDS += "hostap-conf orinoco-conf oz-bootsplash"
+BOOTSTRAP_EXTRA_DEPENDS += "hostap-conf orinoco-conf oz-bootsplash altboot "
 BOOTSTRAP_EXTRA_DEPENDS_append_akita = " usbutils "
 BOOTSTRAP_EXTRA_DEPENDS_append_spitz = " usbutils "
 BOOTSTRAP_EXTRA_DEPENDS_append_tosa  = " usbutils "
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index 9c3f83e011..34284c9d96 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -15,3 +15,57 @@ IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 PARALLEL_INSTALL_MODULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-pcnet-cs"
+
+# NFS Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+
+# Crypto Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-des kernel-module-md5"
+
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-smbfs kernel-module-cramfs"
+
+# Serial Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-8250 kernel-module-serial-cs"
+
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+
+# Infrared Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet"
+
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+                             kernel-module-g-serial kernel-module-g-ether"
+
+# Wireless Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
+                             kernel-module-ieee80211-crypt kernel-module-ieee80211-crypt-ccmp \
+                             kernel-module-ieee80211-crypt-tkip kernel-module-ieee80211-crypt-wep \
+                             kernel-module-arc4 kernel-module-michael-mic kernel-module-aes"
+
+# Sound Modules
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc \
+                             kernel-module-snd-timer kernel-module-snd-pcm  \
+                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx \
+                             kernel-module-snd-soc-pxa2xx-i2s"
+
+# USB Host modules
+
+USBHOST_MODULES = "kernel-module-ohci-hcd kernel-module-usbcore kernel-module-usbhid \
+                   kernel-module-usbnet kernel-module-sd-mod kernel-module-scsi-mod \
+                   kernel-module-usbmouse kernel-module-mousedev kernel-module-hci-usb \
+                   kernel-module-usbserial kernel-module-usb-storage kernel-module-ir-usb"
+
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_spitz += " ${USBHOST_MODULES} "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_akita += " ${USBHOST_MODULES} "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_tosa  += " ${USBHOST_MODULES} "
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 030f157b73..8623cdbc14 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -7,9 +7,10 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel altboot"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \
 sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor altboot"
+kernel-module-usbdcore kernel-module-usbdmonitor"
 
 # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
 
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index 0295d88b4d..43381a2b25 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -5,36 +5,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral \
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils udev-utils \
 			    alsa-utils-alsactl alsa-utils-alsamixer alsa-conf alsa-settings"
 
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
-
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             hostap-conf orinoco-conf kernel-module-ieee80211-crypt-wep"
-
 # Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_poodle += " kernel-module-snd-soc-poodle "
 
 PREFERRED_VERSION_linux-openzaurus = "2.6.17"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 6b0671b395..e4168c42b5 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -16,60 +16,6 @@ module-init-tools altboot"
 #pcmcia-cs apm  wireless-tools irda-utils console-tools \
 #ppp ppp-dialin openswan wpa-supplicant-nossl"
 
-
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet"
-
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
-
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             kernel-module-ieee80211-crypt kernel-module-ieee80211-crypt-ccmp \
-                             kernel-module-ieee80211-crypt-tkip kernel-module-ieee80211-crypt-wep \
-							 kernel-module-arc4 kernel-module-michael-mic kernel-module-aes"
-
-# Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm  \
-                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-							  
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0  += " ${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " ${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " ${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-
-# USB Host modules
-
-USBHOST_MODULES = "kernel-module-ohci-hcd kernel-module-usbcore kernel-module-usbhid \
-                   kernel-module-usbnet kernel-module-sd-mod kernel-module-scsi-mod \
-                   kernel-module-usbmouse kernel-module-mousedev kernel-module-hci-usb \
-                   kernel-module-usbserial kernel-module-usb-storage kernel-module-ir-usb"
-
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " ${USBHOST_MODULES} "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " ${USBHOST_MODULES} "
-BOOTSTRAP_EXTRA_RDEPENDS_append_tosa  += " ${USBHOST_MODULES} "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_c7x0  += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "