[OE-core] [PATCH 6/7] multilib: fix install file conflicts

richard.purdie at linuxfoundation.org richard.purdie at linuxfoundation.org
Thu Sep 6 22:31:14 UTC 2018


On Thu, 2018-09-06 at 23:52 +0800, kai.kang at windriver.com wrote:
> diff --git a/meta/recipes-core/udev/eudev_3.2.5.bb b/meta/recipes-
> core/udev/eudev_3.2.5.bb
> index 75617c8d4e..75130f03ef 100644
> --- a/meta/recipes-core/udev/eudev_3.2.5.bb
> +++ b/meta/recipes-core/udev/eudev_3.2.5.bb
> @@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/$
> {BP}.tar.gz \
>  SRC_URI[md5sum] = "6ca08c0e14380f87df8e8aceac123671"
>  SRC_URI[sha256sum] =
> "49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af"
>  
> -inherit autotools update-rc.d qemu pkgconfig distro_features_check
> +inherit autotools update-rc.d qemu pkgconfig distro_features_check
> multilib_script
> +
> +MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/udev.pc"
>  
>  CONFLICT_DISTRO_FEATURES = "systemd"
>  
> @@ -65,7 +67,7 @@ PACKAGES =+ "eudev-hwdb"
>  
>  
>  FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
> -FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
> +FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc* \
>                     ${includedir}/libudev.h ${libdir}/libudev.so \
>                     ${includedir}/udev.h ${libdir}/libudev.la \
>                     ${libdir}/libudev.a
> ${libdir}/pkgconfig/libudev.pc"

I already commented on this, the file should be installed into libdir
if its arch specific. I suspect libudev.pc is, udev.pc is not and
udev.pc needs to stop referencing libdir. 

Regardless, we're not using MULTILIB_SCRIPTS for .pc files.

Cheers,

Richard



More information about the Openembedded-core mailing list