Updates against mainline OE to fix various issues and make builds work again as a couple of poky changes got lost

git-svn-id: https://svn.o-hand.com/repos/poky@29 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 4 insertions, 8 deletions

diff --git a/openembedded/packages/pcmciautils/pcmciautils_010.bb b/openembedded/packages/pcmciautils/pcmciautils_010.bb
index f619a98235..8045a0e442 100644
--- a/openembedded/packages/pcmciautils/pcmciautils_010.bb
+++ b/openembedded/packages/pcmciautils/pcmciautils_010.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
-DEPENDS = "sysfsutils udev"
-RDEPENDS = "udev"
+DEPENDS = "sysfsutils udev module-init-tools"
+RDEPENDS = "udev module-init-tools"
 HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
@@ -8,15 +8,11 @@ PRIORITY = "optional"
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 S = "${WORKDIR}/pcmciautils-${PV}"
 
-PR = "r1"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
+PR = "r3"
 
 export HOSTCC = "${BUILD_CC}"
 export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
 export pcmciaconfdir = "${sysconfdir}/pcmcia"
 export udevrulesdir = "${sysconfdir}/udev/rules.d"
 export UDEV = 1