aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2016-11-21 09:37:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-05 13:54:06 +0000
commit8f12a03dda3568b70a7f22db764381bedb745b92 (patch)
treeacf64e1cf7097e20c78a581d136a1d33baf85244
parentbb7aecb2f9b1d0e03c798bcf308801976a59b98a (diff)
downloadopenembedded-core-contrib-8f12a03dda3568b70a7f22db764381bedb745b92.tar.gz
openembedded-core-contrib-8f12a03dda3568b70a7f22db764381bedb745b92.tar.bz2
openembedded-core-contrib-8f12a03dda3568b70a7f22db764381bedb745b92.zip
module.bbclass: allow to override location of Module.symvers
Requiring all build systems for external kernel modules to place Module.symvers directly into ${B}/. is quite an artificial assumption/requirement. It doesn't have to end up there, but could easily end up somewhere below ${B}. Allow to override the location below ${B} Note that we still don't make use of multiple Module.symvers in case there are any generated by one single kernel module build, but this is no change in behaviour from before and could be added if there really is a demand for that. Reported-by: Denys Dmytriyenko <denis@denix.org> (From OE-Core rev: caa0fa2ddf0c97255b38b1ec8579944ab4821ff1) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/module.bbclass16
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 95d42da9e77..58470474cc4 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