diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-03-23 22:52:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-23 22:52:12 +0000 |
| commit | 8cce73f9591b8890bafcc9b963f33e6e0f106ba9 (patch) | |
| tree | 3b60a4f1ed60c545e5aca37f3b12a84f647a5b46 /conf/machine/include | |
| parent | 032650fd051a2f7494c201f28497a01ac49a8383 (diff) | |
PCMCIA_MANAGER: Correctly handle this for various machines in a consistent way and set a default in bitbake.conf for backwards compatibility in such a way it can be overridden in a variety of ways.
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/handheld-common.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index fbecc6e25c..f8767d2ddf 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \ input uinput \ " -PCMCIA_MANAGER ?= "pcmcia-cs" - # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index f5d7602699..e73028d7ee 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -4,8 +4,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PREFERRED_VERSION_wpa_supplicant = "0.4.7" +PCMCIA_MANAGER ?= "pcmciautils" + BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules |