[PATCH v2 23/25] lttng-modules: Replace '/lib' with ${nonarch_base_libdir}

Amarnath Valluri
2017-02-22T08:28:00Z

Do not assume '/lib' for kernel modules location, instead use
${nonarch_base_libdir}. Because when 'usrmerge' distro feature is enabled,
kernel modules are not located in /lib/modules, instead /usr/lib/modules.

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
---
meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
index e59d6bc..3536f26 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.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'))
}

--
2.7.4