[OE-core] [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir

[Richard Purdie]

On Mon, 2012-12-17 at 11:16 +0200, Constantin Musca wrote:
> Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
> ---
>  meta/recipes-core/udev/udev.inc    | 24 ++++++++++++------------
>  meta/recipes-core/udev/udev_182.bb |  2 +-
>  2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
> index 4705b9b..9f83821 100644
> --- a/meta/recipes-core/udev/udev.inc
> +++ b/meta/recipes-core/udev/udev.inc
> @@ -32,16 +32,16 @@ inherit autotools pkgconfig update-rc.d
>  
>  # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
>  sbindir = "${base_sbindir}"
> -libexecdir = "${base_libdir}" 
> +libexecdir = "${nonarch_base_libdir}"
>  EXTRA_OECONF = "--disable-introspection \
> -                --with-rootlibdir=${base_libdir} \
> +                --with-rootlibdir=${nonarch_base_libdir} \
>                  --with-pci-ids-path=${datadir}/pci.ids \
>                  ac_cv_file__usr_share_pci_ids=no \
>                  ac_cv_file__usr_share_hwdata_pci_ids=no \
>                  ac_cv_file__usr_share_misc_pci_ids=yes \
>                  --sbindir=${base_sbindir} \
> -                --libexecdir=${base_libdir} \
> -                --with-rootlibdir=${base_libdir} \
> +                --libexecdir=${nonarch_base_libdir} \
> +                --with-rootlibdir=${nonarch_base_libdir} \
>                  --with-rootprefix= \
>                 "
>  
> @@ -59,20 +59,20 @@ FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
>  RRECOMMENDS_${PN} += "udev-utils"
>  
>  FILES_${PN}-dbg += "${libexecdir}/.debug"
> -FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
> -FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
> +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/"
> +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
>  FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
> -FILES_libudev = "${base_libdir}/libudev.so.*"
> -FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
> +FILES_libudev = "${nonarch_base_libdir}/libudev.so.*"
> +FILES_libudev-dbg = "${nonarch_base_libdir}/.debug/libudev.so.*"
>  FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
>                       ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
> -FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
> -FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
> +FILES_libgudev = "${nonarch_base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
> +FILES_libgudev-dbg = "${nonarch_base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
>  FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
>                       ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
>  FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
>  
> -FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
> +FILES_udev-acl = "${nonarch_base_libdir}/udev/udev-acl ${nonarch_base_libdir}/udev/rules.d/70-acl.rules"

This doesn't look right.

Binaries and libraries need to go into ${base_libdir}, rules and other
files that don't vary by architecture need to go into
${nonarch_base_libdir}.

Cheers,

Richard