From 2585f4252a3831bf9c5e6ab69d9da2c1325e6bc0 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 11 Sep 2018 19:25:24 -0400 Subject: 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. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.5.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/udev') 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" 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 \ -- cgit 1.2.3-korg