]> code.ossystems Code Review - openembedded-core.git/commitdiff
eudev: set configure option --with-rootlibexecdir
authorKai Kang <kai.kang@windriver.com>
Tue, 11 Sep 2018 23:25:24 +0000 (19:25 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 12 Sep 2018 07:17:37 +0000 (08:17 +0100)
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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/udev/eudev_3.2.5.bb

index 75617c8d4ec55af92b96771b4a383942af540d3f..efd62c6495a2410d626ca17e36dbe9f71a461837 100644 (file)
@@ -30,6 +30,7 @@ CONFLICT_DISTRO_FEATURES = "systemd"
 EXTRA_OECONF = " \
     --sbindir=${base_sbindir} \
     --with-rootlibdir=${base_libdir} \
+    --with-rootlibexecdir=${nonarch_base_libdir}/udev \
     --with-rootprefix= \
 "
 
@@ -64,7 +65,7 @@ PACKAGES =+ "libudev"
 PACKAGES =+ "eudev-hwdb"
 
 
-FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
+FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
 FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
                    ${includedir}/libudev.h ${libdir}/libudev.so \
                    ${includedir}/udev.h ${libdir}/libudev.la \