summaryrefslogtreecommitdiffstats
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-18 00:37:57 +0100
commitb24d28428a79ccc10358546b09729f419f6f7fae (patch)
treeaddec3e4d4e338b79a08c11cbdd75e4572e1fda7
parent79a205be0dae01c68a81b3a992193a71f666844e (diff)
downloadpoky-b24d28428a79ccc10358546b09729f419f6f7fae.tar.gz
pcmciautils: Use pkgconfig to set udev variables correctly
(From OE-Core rev: e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8DEPENDS = "sysfsutils flex-native" 8DEPENDS = "udev sysfsutils flex-native"
9RDEPENDS_${PN} = "udev module-init-tools" 9RDEPENDS_${PN} = "udev module-init-tools"
10 10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
@@ -16,8 +16,8 @@ export HOSTCC = "${BUILD_CC}"
16export etcdir = "${sysconfdir}" 16export etcdir = "${sysconfdir}"
17export sbindir = "${base_sbindir}" 17export sbindir = "${base_sbindir}"
18export pcmciaconfdir = "${sysconfdir}/pcmcia" 18export pcmciaconfdir = "${sysconfdir}/pcmcia"
19export udevdir = "${base_libdir}/udev" 19export udevdir = "`pkg-config --variable=udevdir udev`"
20export udevrulesdir = "${nonarch_base_libdir}/udev/rules.d" 20export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d"
21export UDEV = "1" 21export UDEV = "1"
22LD = "${CC}" 22LD = "${CC}"
23CFLAGS =+ "-I${S}/src" 23CFLAGS =+ "-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
7 7
8PR = "r1" 8PR = "r1"
9 9
10FILES_${PN}-dbg += "${base_libdir}/udev/.debug" 10FILES_${PN}-dbg += "*/udev/.debug"
11FILES_${PN} += "${base_libdir}/udev ${nonarch_base_libdir}/udev" 11FILES_${PN} += "*/udev"