diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-12-15 17:44:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-12-15 17:44:52 +0000 |
| commit | d37555f2b9eeda5ced77324b3b2b155a73049b72 (patch) | |
| tree | 9286e00028622f1d29bb770365154562acb46bd1 /openembedded/conf | |
| parent | 748927fa055a52708cbbf27ecde8b915e7218a2c (diff) | |
| download | poky-d37555f2b9eeda5ced77324b3b2b155a73049b72.tar.gz | |
Switch to pcmciautils instead of pcmcia-cs. Remove the unneeded pcmcia-cs dependency from nokia770.conf
git-svn-id: https://svn.o-hand.com/repos/poky@195 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
| -rw-r--r-- | openembedded/conf/machine/handheld-common.conf | 4 | ||||
| -rw-r--r-- | openembedded/conf/machine/nokia770.conf | 4 | ||||
| -rw-r--r-- | openembedded/conf/machine/zaurus-clamshell-2.6.conf | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/openembedded/conf/machine/handheld-common.conf b/openembedded/conf/machine/handheld-common.conf index dab1d01e70..4bb8325dea 100644 --- a/openembedded/conf/machine/handheld-common.conf +++ b/openembedded/conf/machine/handheld-common.conf | |||
| @@ -17,8 +17,8 @@ input uinput \ | |||
| 17 | " | 17 | " |
| 18 | 18 | ||
| 19 | # Configuration bits for "generic handheld" | 19 | # Configuration bits for "generic handheld" |
| 20 | BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" | 20 | BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" |
| 21 | BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts" | 21 | BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" |
| 22 | BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" | 22 | BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" |
| 23 | 23 | ||
| 24 | INHERIT += "linux_modules" | 24 | INHERIT += "linux_modules" |
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 9f49f24563..637b4311f4 100644 --- a/openembedded/conf/machine/nokia770.conf +++ b/openembedded/conf/machine/nokia770.conf | |||
| @@ -31,10 +31,10 @@ SERIAL_CONSOLE = "115200 ttyS0" | |||
| 31 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" | 31 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" |
| 32 | 32 | ||
| 33 | BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ | 33 | BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ |
| 34 | pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" | 34 | apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" |
| 35 | 35 | ||
| 36 | BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ | 36 | BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ |
| 37 | pcmcia-cs apm ppp wireless-tools console-tools" | 37 | apm ppp wireless-tools console-tools" |
| 38 | 38 | ||
| 39 | # NFS Modules | 39 | # NFS Modules |
| 40 | #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" | 40 | #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" |
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf index 757fc6acf3..007750a39b 100644 --- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf | |||
| @@ -4,11 +4,11 @@ | |||
| 4 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" | 4 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" |
| 5 | 5 | ||
| 6 | BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ | 6 | BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ |
| 7 | pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ | 7 | pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ |
| 8 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" | 8 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" |
| 9 | 9 | ||
| 10 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ | 10 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ |
| 11 | pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ | 11 | pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ |
| 12 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" | 12 | ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" |
| 13 | 13 | ||
| 14 | # Ethernet modules | 14 | # Ethernet modules |