udev: fix unsafe reference by installing libgudev in libdir

[CQID: WIND00444742]

This patch fixes the following QA issue about unsafe reference in
binaries.

/lib/libgudev-1.0.so.0.1.1 requires /usr/lib/libgobject-2.0.so.0.

As libgudev is a GObject wrapper for libudev, and the purpose of
it is to make the development of GObject based applications easier,
there's no reason why it should remain in /lib. So this patches moves
the libgudev to /usr/lib.

This patch also removes a duplicate line in the EXTRA_OECONF.

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20131113

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 280da10b4822327b6bfa858028acc2ff345067b1..cb6279f241d4d981bc2425c8412ffb88c76493dd 100644 (file)
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -42,7 +42,6 @@ EXTRA_OECONF = "--disable-introspection \
                 ac_cv_file__usr_share_misc_pci_ids=yes \
                 --sbindir=${base_sbindir} \
                 --libexecdir=${nonarch_base_libdir} \
-                --with-rootlibdir=${base_libdir} \
                 --with-rootprefix= \
                 --without-systemdsystemunitdir \
                "
@@ -92,6 +91,13 @@ do_install_append () {
        # hid2hci has moved to bluez4. removed in udev as of version 169
        rm -f ${D}${base_libdir}/udev/hid2hci
 
+       if [ "${libdir}" != "${base_libdir}" ]; then
+           # install libgudev.so.* into libdir.
+           so_img_name=`basename $(readlink ${D}${libdir}/libgudev-1.0.so)`
+           mv ${D}${base_libdir}/libgudev-1.0.so.* ${D}${libdir}
+           ln -sf $so_img_name ${D}${libdir}/libgudev-1.0.so
+       fi
+
        echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
 }