[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5209/8267] lttng-modules: Replace '/lib' with ${nonarch_base_libdir}

[Emmanuele Bassi <ebassi src gnome org>]

commit 4ef916ba24414c14b2290d36a05b18774304a85b
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Tue Feb 14 16:07:56 2017 +0200

    lttng-modules: Replace '/lib' with ${nonarch_base_libdir}
    
    Do not assume '/lib' for kernel modules location, instead use
    ${nonarch_base_libdir}. When 'usrmerge' is enabled, kernel modules are not
    located in /lib/modules, but /usr/lib/modules.
    
    (From OE-Core rev: d0f99c7f264fb99e7a940e9b02d27a418bafad27)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb 
b/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
index 8e47c6f..abff79d 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb
@@ -22,11 +22,11 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
 
 do_install_append() {
        # Delete empty directories to avoid QA failures if no modules were built
-       find ${D}/lib -depth -type d -empty -exec rmdir {} \;
+       find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
 }
 
 python do_package_prepend() {
-    if not os.path.exists(os.path.join(d.getVar('D'), 'lib/modules')):
+    if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
         bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in 
your kernel." % d.getVar('PN'))
 }