diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-09-11 19:25:24 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 07:42:28 +0100 |
commit | 7118a4b7935b5c0bf7a9390da334e1f500e3a60d (patch) | |
tree | fcdd01fa5ff1b888a93e95b2fb1548108a384b83 /meta | |
parent | d577afd930d2eec46db6805314b8bab7b700841a (diff) | |
download | poky-7118a4b7935b5c0bf7a9390da334e1f500e3a60d.tar.gz |
eudev: set configure option --with-rootlibexecdir
Set configure option '--with-rootlibexecdir' for eudev to fix udev.pc file conflict:
| file /usr/share/pkgconfig/udev.pc conflicts between attempted installs of eudev-dev-3.2.5-r0.core2_64 and lib32-eudev-dev-3.2.5-r0.x86
It alway sets 'udevdir' in udev.pc with value '/lib/udev' that systemd
does the same thing.
(From OE-Core rev: 2585f4252a3831bf9c5e6ab69d9da2c1325e6bc0)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/udev/eudev_3.2.5.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/eudev_3.2.5.bb b/meta/recipes-core/udev/eudev_3.2.5.bb index 75617c8d4e..efd62c6495 100644 --- a/meta/recipes-core/udev/eudev_3.2.5.bb +++ b/meta/recipes-core/udev/eudev_3.2.5.bb | |||
@@ -30,6 +30,7 @@ CONFLICT_DISTRO_FEATURES = "systemd" | |||
30 | EXTRA_OECONF = " \ | 30 | EXTRA_OECONF = " \ |
31 | --sbindir=${base_sbindir} \ | 31 | --sbindir=${base_sbindir} \ |
32 | --with-rootlibdir=${base_libdir} \ | 32 | --with-rootlibdir=${base_libdir} \ |
33 | --with-rootlibexecdir=${nonarch_base_libdir}/udev \ | ||
33 | --with-rootprefix= \ | 34 | --with-rootprefix= \ |
34 | " | 35 | " |
35 | 36 | ||
@@ -64,7 +65,7 @@ PACKAGES =+ "libudev" | |||
64 | PACKAGES =+ "eudev-hwdb" | 65 | PACKAGES =+ "eudev-hwdb" |
65 | 66 | ||
66 | 67 | ||
67 | FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm" | 68 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" |
68 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 69 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
69 | ${includedir}/libudev.h ${libdir}/libudev.so \ | 70 | ${includedir}/libudev.h ${libdir}/libudev.so \ |
70 | ${includedir}/udev.h ${libdir}/libudev.la \ | 71 | ${includedir}/udev.h ${libdir}/libudev.la \ |