[oe-commits] [openembedded-core] 25/64: lttng-modules: Replace '/lib' with ${nonarch_base_libdir}

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 81d5270b35329c7d4e7ff0efc64762e21e8bda5e
Author: Amarnath Valluri <amarnath.valluri at intel.com>
AuthorDate: 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.
    
    Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
---
 meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb | 4 ++--
 1 file 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'))
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.