pcmcia-cs: Remove references to long-deprecated pcmcia-cs.

pcmciautils is the appropriate PCMCIA package these days.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1ca885fe3f08619a6db5d3b33e457a4125e6a1f0..744f4dfda83b11dc6dc2e428a8ddf265e16085e2 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -689,7 +689,7 @@ DL_DIR ?= "${TOPDIR}/downloads"
 SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 IMAGE_FSTYPES ?= "tar.gz"
 INITRAMFS_FSTYPES ?= "cpio.gz"
-PCMCIA_MANAGER ?= "pcmcia-cs"
+PCMCIA_MANAGER ?= "pcmciautils"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
 IMAGE_ROOTFS_SIZE ?= "65536"

diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 24b307b8623433a3d60c7225d88dda6ce146c59b..e8a1811228f03fda2d0e2254508d9ce6f114e3fa 100644 (file)
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -109,7 +109,7 @@ T[doc]       = "Temporary directory within the WORKDIR."
 GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
 ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale"
 
-PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)."
+PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (currently, pcmciautils)."
 
 SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
 

diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index c0c1d0cea4ebb0bc7c7d2e53414b5e6524d167dc..fa35daf46d186685271a85e39ddd797b661b5711 100644 (file)
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "sysfsutils flex-native"
 RDEPENDS_${PN} = "udev module-init-tools"
-RCONFLICTS_${PN} += "pcmcia-cs"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 

diff --git a/meta/recipes-core/udev/udev/network.sh b/meta/recipes-core/udev/udev/network.sh
index 5016328df4b188d753a9c37b439c9090cbb213b2..bccd422dbf527857cf0dc3f6816eadb297a17f09 100644 (file)
--- a/meta/recipes-core/udev/udev/network.sh
+++ b/meta/recipes-core/udev/udev/network.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# Do not run when pcmcia-cs is installed
-test -x /sbin/cardctl && exit 0
-
 # We get two "add" events for hostap cards due to wifi0
 echo "$INTERFACE" | grep -q wifi && exit 0