diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-04 17:25:45 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-04 17:25:45 +0000 |
| commit | 1c2c9a48b6502d670f0301041ebf6688fe2253a5 (patch) | |
| tree | c1cf80fa5009f1ac593f94d8c3d22cda11149b82 /conf | |
| parent | 78aec07f5952e183e52782d62300aad7228ceb09 (diff) | |
| parent | 44393416e78093a7d0d6f6ec038729e0b7e45e25 (diff) | |
merge of 3337830555cb6398337a599f4649e61cac2ae122
and a96120ae4432f090395e5fa91129bb55062af8ee
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug.conf | 5 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index e4b20c0e5f..22e835e257 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -91,9 +91,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Select the correct versions of the kernel and modules -PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2" +# The nslu2-kernel version is currently tracking the latest +# Change before release! +#PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 31da23e4fc..7708954845 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -36,7 +36,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools udev-utils console-tools" +pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 75853bee23..cef670b450 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -7,9 +7,15 @@ pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplica hostap-utils prism3-firmware prism3-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apm ppp wireless-tools irda-utils console-tools \ +pcmcia-cs apm apmd ppp wireless-tools irda-utils console-tools \ hostap-utils prism3-firmware prism3-support" +# Spitz needs minimal bootstrap +BOOTSTRAP_EXTRA_DEPENDS_spitz = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ +pcmcia-cs apmd wireless-tools irda-utils wpa-supplicant-nossl lrzsz hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_RDEPENDS_spitz = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ +pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support" + # Misc Modules BOOTSTRAP_EXTRA_RDEPENDS += kernel-module-net-fd kernel-module-registers |