From d37555f2b9eeda5ced77324b3b2b155a73049b72 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 15 Dec 2005 17:44:52 +0000 Subject: 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 --- openembedded/conf/machine/handheld-common.conf | 4 ++-- openembedded/conf/machine/nokia770.conf | 4 ++-- 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 dab1d01e7..4bb8325de 100644 --- a/openembedded/conf/machine/handheld-common.conf +++ b/openembedded/conf/machine/handheld-common.conf @@ -17,8 +17,8 @@ input uinput \ " # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" -BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts" +BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" +BOOTSTRAP_EXTRA_RDEPENDS += "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)}" INHERIT += "linux_modules" diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 9f49f2456..637b4311f 100644 --- a/openembedded/conf/machine/nokia770.conf +++ b/openembedded/conf/machine/nokia770.conf @@ -31,10 +31,10 @@ SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ -pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" +apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools console-tools" +apm ppp wireless-tools console-tools" # NFS Modules #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 757fc6acf..007750a39 100644 --- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf @@ -4,11 +4,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ -pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ +pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" 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 \ +pcmciautils 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" # Ethernet modules -- cgit v1.2.3