1 files changed, 12 insertions, 4 deletions

diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 95d42da9e7..58470474cc 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -7,6 +7,7 @@ do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
 EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
 MODULES_INSTALL_TARGET ?= "modules_install"
+MODULES_MODULE_SYMVERS_LOCATION ?= ""
 
 python __anonymous () {
     depends = d.getVar('DEPENDS')
@@ -35,10 +36,17 @@ module_do_install() {
                    O=${STAGING_KERNEL_BUILDDIR} \
                    ${MODULES_INSTALL_TARGET}
 
-        install -d -m0755 ${D}${includedir}/${BPN}
-        cp -a --no-preserve=ownership ${B}/Module.symvers ${D}${includedir}/${BPN}
-        # it doesn't actually seem to matter which path is specified here
-        sed -e 's:${B}/::g' -i ${D}${includedir}/${BPN}/Module.symvers
+        if [ ! -e "${B}/${MODULES_MODULE_SYMVERS_LOCATION}/Module.symvers" ] ; then
+                bbwarn "Module.symvers not found in ${B}/${MODULES_MODULE_SYMVERS_LOCATION}"
+                bbwarn "Please consider setting MODULES_MODULE_SYMVERS_LOCATION to a"
+                bbwarn "directory below B to get correct inter-module dependencies"
+        else
+                install -Dm0644 "${B}/${MODULES_MODULE_SYMVERS_LOCATION}"/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
+                # Module.symvers contains absolute path to the build directory.
+                # While it doesn't actually seem to matter which path is specified,
+                # clear them out to avoid confusion
+                sed -e 's:${B}/::g' -i ${D}${includedir}/${BPN}/Module.symvers
+        fi
 }
 
 EXPORT_FUNCTIONS do_compile do_install