diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-07-26 21:24:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-26 21:24:28 +0000 |
| commit | 46a1dff8a41247f03ce4dff60450b4436de4f5a3 (patch) | |
| tree | 290ee3998019d429368f447f94cc48dd4d5f9ccf | |
| parent | 15d0fd9b0eaca68fd6252a6b12ab5328cba7a063 (diff) | |
zaurus-clamshell*.conf: don't override BOOTSTRAP_EXTRA_?DEPENDS, since
there may be bbclasses that already have populated it
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 23 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 20 |
2 files changed, 21 insertions, 22 deletions
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 5098b6beea..705dcd1905 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -1,3 +1,6 @@ +# Zaurus Clamshell specific configuration for kernel 2.4 +# Don't forget to include zaurus-clamshell.conf as well + 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" @@ -5,22 +8,16 @@ 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" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apm apmd ppp wireless-tools irda-utils console-tools \ -hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ +pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ +wpa-supplicant-nossl ppp ppp-dialin openswan" -# 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" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ +pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \ +wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules -BOOTSTRAP_EXTRA_RDEPENDS += kernel-module-net-fd kernel-module-registers +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" # USB Client Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 7b6761b250..9b0ef708fa 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -1,14 +1,16 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PREFERRED_VERSION_orinoco-modules = "0.15rc1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ -pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \ -hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ +pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin openswan wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ -pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools \ -hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ +pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin openswan wpa-supplicant-nossl" # Ethernet modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" @@ -28,7 +30,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- BOOTSTRAP_EXTRA_RDEPENDS += "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" +# USB Gadget Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" |