summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 13:49:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 16:18:19 +0100
commite177bad3c5f2d37fe7a0092c22cc3dfc556f3dea (patch)
treee7db1a9cccd0e4cfba7f55c78b0a9f6c112f3a2d /meta/recipes-bsp
parent138c5f3af892e33f576fc7dd268e122b179f82a1 (diff)
downloadopenembedded-core-e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea.tar.gz
openembedded-core-e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea.tar.bz2
openembedded-core-e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea.zip
pcmciautils: Use pkgconfig to set udev variables correctly
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils.inc6
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 065123682a..0ef939e843 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -5,7 +5,7 @@ SECTION = "kernel/userland"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "sysfsutils flex-native"
+DEPENDS = "udev sysfsutils flex-native"
RDEPENDS_${PN} = "udev module-init-tools"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
@@ -16,8 +16,8 @@ export HOSTCC = "${BUILD_CC}"
export etcdir = "${sysconfdir}"
export sbindir = "${base_sbindir}"
export pcmciaconfdir = "${sysconfdir}/pcmcia"
-export udevdir = "${base_libdir}/udev"
-export udevrulesdir = "${nonarch_base_libdir}/udev/rules.d"
+export udevdir = "`pkg-config --variable=udevdir udev`"
+export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d"
export UDEV = "1"
LD = "${CC}"
CFLAGS =+ "-I${S}/src"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 41fd799b33..50629b4b14 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -7,5 +7,5 @@ SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0
PR = "r1"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
-FILES_${PN} += "${base_libdir}/udev ${nonarch_base_libdir}/udev"
+FILES_${PN}-dbg += "*/udev/.debug"
+FILES_${PN} += "*/udev"