Patchwork pcmciautils: Use pkgconfig to set udev variables correctly

login
register
mail settings
Submitter Richard Purdie
Date April 17, 2013, 3:28 p.m.
Message ID <1366212500.25282.47.camel@ted>
Download mbox | patch
Permalink /patch/48461/
State Accepted
Commit e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea
Headers show

Comments

Richard Purdie - April 17, 2013, 3:28 p.m.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 0651236..0ef939e 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 41fd799..50629b4 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"