summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-14 00:02:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-14 00:02:49 +0000
commitc0492c23bce509d6623697dc0a55828be3be1ba3 (patch)
tree46810853add7840777cf4cd441bb8368764a52c5 /conf
parent145b644de0d3567c07c111990a296dcba76f675a (diff)
parent5a5bb7411fc66507d8677bacc4c81abcb71d6fe6 (diff)
merge of 2117dd5b726765202daffe67318297ef78df5a4f
and 2913dd5a4db27b7b121a13b703b88a41e73464aa
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/poodle-2.4.conf8
-rw-r--r--conf/machine/poodle-2.6.conf1
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf3
3 files changed, 9 insertions, 3 deletions
diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf
index bb3ae039d9..dc603d3bcc 100644
--- a/conf/machine/poodle-2.4.conf
+++ b/conf/machine/poodle-2.4.conf
@@ -1,9 +1,13 @@
PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
-hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \
+hostap-modules orinoco-modules sharp-sdmmc-support \
hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \
kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
kernel-module-usbdcore kernel-module-usbdmonitor \
hostap-utils prism3-firmware prism3-support"
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index 72a751d19e..7edebad2d3 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -1,5 +1,4 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "0.13e-26"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index cef670b450..3291a00df6 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -2,6 +2,9 @@ PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
hostap-utils prism3-firmware prism3-support"