module.bbclass: allow to override location of Module.symvers

PATCH In review André Draszik 2 participants 5 messages Nov 21, 2016 – Dec 21, 2016

lore

Share & tools

lore

André Draszik

author

2016-11-21 09:37 UTC #0 lore raw

PATCH 1/1 module.bbclass: allow to override location of Module.symvers

From: André Draszik <[email protected]>

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 <[email protected]>

Signed-off-by André Draszik <[email protected]>

---
 meta/classes/module.bbclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

meta/classes/module.bbclass +12 -4

index 68e3d34..037ca4f 100644
@@ -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', True)

@@ -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

Signature · 1 line

2.10.2

Denys Dmytriyenko

Acked-by on v1 1/1

2016-11-22 22:33 UTC #1 lore raw

Quoted 9 lines · André Draszik

From: André Draszik <[email protected]>
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}

Quoted 8 lines

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 <[email protected]>
Signed-off-by André Draszik <[email protected]>

Looks good to me, thanks.

Acked-by Denys Dmytriyenko <[email protected]>

Quoted 3 lines

---
 meta/classes/module.bbclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

[...]

meta/classes/module.bbclass module_do_install() { · line 44

Quoted 10 lines

meta/classes/module.bbclass +6 -4

-	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

BTW, is "-Dm0644" portable?

Quoted 5 lines

meta/classes/module.bbclass +5 -0

+		# 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

André Draszik

author

2016-11-23 08:01 UTC #2 lore raw

Quoted 6 lines · Denys Dmytriyenko

Quoted 3 lines · André Draszik
(quoted diff) +1 -0
+		install -Dm0644
"${B}/${MODULES_MODULE_SYMVERS_LOCATION}"/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
BTW, is "-Dm0644" portable?

Not sure, I would expect busybox' install to support it. OTOH, FreeBSD install seems to have completely different parameters, in particular -D has different semantics.

Cheers,
Andre'

André Draszik

author

2016-12-12 15:38 UTC #3 lore raw

In reply to André Draszik

ping

Quoted 66 lines · André Draszik

From: André Draszik <[email protected]>
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 <[email protected]>
Signed-off-by André Draszik <[email protected]>
---
meta/classes/module.bbclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
meta/classes/module.bbclass +0 -0
index 68e3d34..037ca4f 100644
@@ -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', True)
meta/classes/module.bbclass +0 -0
@@ -35,10 +36,17 @@ module_do_install() {
  	           O=${STAGING_KERNEL_BUILDDIR} \
  	           ${MODULES_INSTALL_TARGET}
meta/classes/module.bbclass +0 -2
-	install -d -m0755 ${D}${includedir}/${BPN}
-	cp -a --no-preserve=ownership ${B}/Module.symvers
${D}${includedir}/${BPN}
meta/classes/module.bbclass +1 -2
-	# 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
meta/classes/module.bbclass +1 -0
+		bbwarn "Module.symvers not found in
${B}/${MODULES_MODULE_SYMVERS_LOCATION}"
meta/classes/module.bbclass +1 -0
+		bbwarn "Please consider setting
MODULES_MODULE_SYMVERS_LOCATION to a"
meta/classes/module.bbclass +1 -0
+		bbwarn "directory below B to get correct inter-module
dependencies"
meta/classes/module.bbclass +2 -0
+	else
+		install -Dm0644
"${B}/${MODULES_MODULE_SYMVERS_LOCATION}"/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
meta/classes/module.bbclass +1 -0
+		# Module.symvers contains absolute path to the build
directory.
meta/classes/module.bbclass +1 -0
+		# While it doesn't actually seem to matter which path is
specified,
meta/classes/module.bbclass +2 -0
+		# clear them out to avoid confusion
+		sed -e 's:${B}/::g' -i
${D}${includedir}/${BPN}/Module.symvers
meta/classes/module.bbclass +1 -0
+	fi
}

EXPORT_FUNCTIONS do_compile do_install

André Draszik

author

2016-12-21 10:02 UTC #4 lore raw

In reply to André Draszik

ping

Quoted 66 lines · André Draszik

From: André Draszik <[email protected]>
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 <[email protected]>
Signed-off-by André Draszik <[email protected]>
---
meta/classes/module.bbclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
meta/classes/module.bbclass +0 -0
index 68e3d34..037ca4f 100644
@@ -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', True)
meta/classes/module.bbclass +0 -0
@@ -35,10 +36,17 @@ module_do_install() {
  	           O=${STAGING_KERNEL_BUILDDIR} \
  	           ${MODULES_INSTALL_TARGET}
meta/classes/module.bbclass +0 -2
-	install -d -m0755 ${D}${includedir}/${BPN}
-	cp -a --no-preserve=ownership ${B}/Module.symvers
${D}${includedir}/${BPN}
meta/classes/module.bbclass +1 -2
-	# 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
meta/classes/module.bbclass +1 -0
+		bbwarn "Module.symvers not found in
${B}/${MODULES_MODULE_SYMVERS_LOCATION}"
meta/classes/module.bbclass +1 -0
+		bbwarn "Please consider setting
MODULES_MODULE_SYMVERS_LOCATION to a"
meta/classes/module.bbclass +1 -0
+		bbwarn "directory below B to get correct inter-module
dependencies"
meta/classes/module.bbclass +2 -0
+	else
+		install -Dm0644
"${B}/${MODULES_MODULE_SYMVERS_LOCATION}"/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
meta/classes/module.bbclass +1 -0
+		# Module.symvers contains absolute path to the build
directory.
meta/classes/module.bbclass +1 -0
+		# While it doesn't actually seem to matter which path is
specified,
meta/classes/module.bbclass +2 -0
+		# clear them out to avoid confusion
+		sed -e 's:${B}/::g' -i
${D}${includedir}/${BPN}/Module.symvers
meta/classes/module.bbclass +1 -0
+	fi
}

EXPORT_FUNCTIONS do_compile do_install