From e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Apr 2013 13:49:53 +0000 Subject: pcmciautils: Use pkgconfig to set udev variables correctly Signed-off-by: Richard Purdie --- meta/recipes-bsp/pcmciautils/pcmciautils.inc | 6 +++--- meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-bsp') 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" -- cgit 1.2.3-korg