summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-02-14 16:07:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:20 +0000
commit4ef916ba24414c14b2290d36a05b18774304a85b (patch)
tree83b71df77445493a51fcda2455ca443f638fe4f0 /meta
parent89c41301f089650aab8a5f9c6a13e55fb0e5f48e (diff)
downloadpoky-4ef916ba24414c14b2290d36a05b18774304a85b.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.9.1.bb4
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 8e47c6f0a1..abff79d06f 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}'"
22 22
23do_install_append() { 23do_install_append() {
24 # Delete empty directories to avoid QA failures if no modules were built 24 # Delete empty directories to avoid QA failures if no modules were built
25 find ${D}/lib -depth -type d -empty -exec rmdir {} \; 25 find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
26} 26}
27 27
28python do_package_prepend() { 28python do_package_prepend() {
29 if not os.path.exists(os.path.join(d.getVar('D'), 'lib/modules')): 29 if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
30 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) 30 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
31} 31}
32 32