[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2661/8267] eudev: don't move udev directory

[Emmanuele Bassi <ebassi src gnome org>]

commit fa7849939a763855139b052fe2179de71f728fee
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Jul 21 02:53:46 2016 -0700

    eudev: don't move udev directory
    
    The code did "mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}"
    which is not needed any more, eudev can work with ${base_libdir}/udev.
    
    (From OE-Core rev: 5e26b3df04716010b31b4c7ac0ac6b28982784f3)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/udev/eudev_3.2.bb |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/meta/recipes-core/udev/eudev_3.2.bb b/meta/recipes-core/udev/eudev_3.2.bb
index 8e229fc..211252c 100644
--- a/meta/recipes-core/udev/eudev_3.2.bb
+++ b/meta/recipes-core/udev/eudev_3.2.bb
@@ -27,7 +27,6 @@ inherit autotools update-rc.d qemu pkgconfig
 
 EXTRA_OECONF = " \
     --sbindir=${base_sbindir} \
-    --libexecdir=${nonarch_base_libdir} \
     --with-rootlibdir=${base_libdir} \
     --with-rootprefix= \
 "
@@ -53,13 +52,6 @@ do_install_append() {
        # Use classic network interface naming scheme
        touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules
 
-       # Fix for multilib systems where libs along with confs are installed incorrectly
-       if ! [ -d ${D}${nonarch_base_libdir}/udev ]
-       then
-               install -d ${D}${nonarch_base_libdir}/udev
-               mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}
-       fi
-
        # hid2hci has moved to bluez4. removed in udev as of version 169
        rm -f ${D}${base_libdir}/udev/hid2hci
 }
@@ -75,7 +67,7 @@ PACKAGES =+ "udev-cache"
 PACKAGES =+ "eudev-hwdb"
 
 
-FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
+FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
 FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
                    ${includedir}/libudev.h ${libdir}/libudev.so \
                    ${includedir}/udev.h ${libdir}/libudev.la \