Skip to contentSkip to conversation

kernel.bbclass: fix module.lds missing issue since kernel v5.10

PATCH In review [email protected] 2 participants 5 messages Nov 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel.bbclass: fix module.lds missing issue since kernel v5.10

With v5.10-rc1 kernel commit 596b0474d3d9 (kbuild: preprocess module
linker script), external kernel module need scripts/module.lds
for compiling.

Error Log:
*** No rule to make target 'scripts/module.lds', needed by ....

---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/kernel.bbclass +9 -0
index 9e3c34ad48..5c262f340e 100644
@@ -358,6 +358,10 @@ do_compile_kernelmodules() {
 		# other kernel modules and will look at this
 		# file to do symbol lookups
 		cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
+		if [ -e ${B}/scripts/module.lds ]; then
+			mkdir -p ${STAGING_KERNEL_BUILDDIR}/scripts
+			cp ${B}/scripts/module.lds ${STAGING_KERNEL_BUILDDIR}/scripts/
+		fi
 	else
 		bbnote "no modules to compile"
 	fi
@@ -465,6 +469,11 @@ do_shared_workdir () {
 	# Copy files required for module builds
 	cp System.map $kerneldir/System.map-${KERNEL_VERSION}
 	[ -e Module.symvers ] && cp Module.symvers $kerneldir/
+	if [ -e ./scripts/module.lds ]; then
+		mkdir -p $kerneldir/scripts
+		cp ./scripts/module.lds $kerneldir/scripts/
+	fi
+
 	cp .config $kerneldir/
 	mkdir -p $kerneldir/include/config
 	cp include/config/kernel.release $kerneldir/include/config/kernel.release
Signature · 1 line
2.17.1
#1 lore raw
Quoted 7 lines · Lili Li

With v5.10-rc1 kernel commit 596b0474d3d9 (kbuild: preprocess module
linker script), external kernel module need scripts/module.lds
for compiling.

Error Log:
*** No rule to make target 'scripts/module.lds', needed by ....

I have a similar change locally, but I do have a question.

Quoted 12 lines
---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/kernel.bbclass +0 -0
index 9e3c34ad48..5c262f340e 100644

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 364

Quoted 7 lines
meta/classes/kernel.bbclass +4 -0
@@ -358,6 +358,10 @@ do_compile_kernelmodules() {
                # other kernel modules and will look at this
                # file to do symbol lookups
                cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
+               if [ -e ${B}/scripts/module.lds ]; then
+                       mkdir -p ${STAGING_KERNEL_BUILDDIR}/scripts
+                       cp ${B}/scripts/module.lds ${STAGING_KERNEL_BUILDDIR}/scripts/
+               fi

You really shouldn't need this here.

The only reason we copy Module.symvers is that the kernel module build updates it.

I only have the single copy in my local change (since it is created by modules_prepare), and I'm not seeing any breakage.

Were you seeing somewhere that it was updated, or something that was breaking ?

Bruce

Quoted 16 lines
meta/classes/kernel.bbclass +5 -1
        else
                bbnote "no modules to compile"
        fi
@@ -465,6 +469,11 @@ do_shared_workdir () {
        # Copy files required for module builds
        cp System.map $kerneldir/System.map-${KERNEL_VERSION}
        [ -e Module.symvers ] && cp Module.symvers $kerneldir/
+       if [ -e ./scripts/module.lds ]; then
+               mkdir -p $kerneldir/scripts
+               cp ./scripts/module.lds $kerneldir/scripts/
+       fi
+
        cp .config $kerneldir/
        mkdir -p $kerneldir/include/config
        cp include/config/kernel.release $kerneldir/include/config/kernel.release
--
Quoted 5 lines

2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

author
#2 lore raw
Quoted 50 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: Friday, November 13, 2020 10:42 AM
To: Li, Lili <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>; Mittal, Anuj <[email protected]>; Pan, Kris <[email protected]>
Subject: Re: [OE-core][gatesgarth][dunfell][master][PATCH] kernel.bbclass: fix module.lds missing issue since kernel v5.10

Quoted 7 lines · Lili Li

With v5.10-rc1 kernel commit 596b0474d3d9 (kbuild: preprocess module linker script), external kernel module need scripts/module.lds for compiling.

Error Log:
*** No rule to make target 'scripts/module.lds', needed by ....

I have a similar change locally, but I do have a question.

Quoted 12 lines
---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/kernel.bbclass +0 -0
index 9e3c34ad48..5c262f340e 100644

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 363

Quoted 6 lines
meta/classes/kernel.bbclass +3 -0
@@ -358,6 +358,10 @@ do_compile_kernelmodules() {
                # other kernel modules and will look at this
                # file to do symbol lookups
                cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
+               if [ -e ${B}/scripts/module.lds ]; then
+                       mkdir -p ${STAGING_KERNEL_BUILDDIR}/scripts
+                       cp ${B}/scripts/module.lds

${STAGING_KERNEL_BUILDDIR}/scripts/

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 364

Quoted 1 line
meta/classes/kernel.bbclass +1 -0
+               fi

You really shouldn't need this here.

The only reason we copy Module.symvers is that the kernel module build updates it.

Quoted 7 lines

I only have the single copy in my local change (since it is created by modules_prepare), and I'm not seeing any breakage.

Were you seeing somewhere that it was updated, or something that was breaking ?

Bruce

Thanks Bruce for catching this! I add this here just in case any further changes, we can remove it as of current process. Will you post your local patch or do you want me to submit v2 version?

Thanks

Quoted 29 lines
Quoted 16 lines
meta/classes/kernel.bbclass +5 -0
        else
                bbnote "no modules to compile"
        fi
@@ -465,6 +469,11 @@ do_shared_workdir () {
        # Copy files required for module builds
        cp System.map $kerneldir/System.map-${KERNEL_VERSION}
        [ -e Module.symvers ] && cp Module.symvers $kerneldir/
+       if [ -e ./scripts/module.lds ]; then
+               mkdir -p $kerneldir/scripts
+               cp ./scripts/module.lds $kerneldir/scripts/
+       fi
+
        cp .config $kerneldir/
        mkdir -p $kerneldir/include/config
        cp include/config/kernel.release
Quoted 7 lines

$kerneldir/include/config/kernel.release
--
2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#3 lore raw
Quoted 54 lines · Lili
Quoted 54 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: Friday, November 13, 2020 10:42 AM
To: Li, Lili <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>; Mittal, Anuj <[email protected]>; Pan, Kris <[email protected]>
Subject: Re: [OE-core][gatesgarth][dunfell][master][PATCH] kernel.bbclass: fix module.lds missing issue since kernel v5.10

Quoted 7 lines · Lili Li

With v5.10-rc1 kernel commit 596b0474d3d9 (kbuild: preprocess module linker script), external kernel module need scripts/module.lds for compiling.

Error Log:
*** No rule to make target 'scripts/module.lds', needed by ....

I have a similar change locally, but I do have a question.

Quoted 12 lines
---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/kernel.bbclass +0 -0
index 9e3c34ad48..5c262f340e 100644

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 363

Quoted 6 lines
meta/classes/kernel.bbclass +3 -0
@@ -358,6 +358,10 @@ do_compile_kernelmodules() {
                # other kernel modules and will look at this
                # file to do symbol lookups
                cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
+               if [ -e ${B}/scripts/module.lds ]; then
+                       mkdir -p ${STAGING_KERNEL_BUILDDIR}/scripts
+                       cp ${B}/scripts/module.lds

${STAGING_KERNEL_BUILDDIR}/scripts/

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 364

Quoted 1 line
meta/classes/kernel.bbclass +1 -0
+               fi

You really shouldn't need this here.

The only reason we copy Module.symvers is that the kernel module build updates it.

I only have the single copy in my local change (since it is created by modules_prepare), and I'm not seeing any breakage.

Quoted 7 lines
Quoted 4 lines

Were you seeing somewhere that it was updated, or something that was breaking ?

Bruce

Thanks Bruce for catching this! I add this here just in case any further changes, we can remove it as of current process. Will you post your local patch or do you want me to submit v2 version?

I have a commit with a few extra details in it here, I can send it on (my) Friday, and add your Signed-off-by on it as well.

If that's ok with you ?

just wanted to run one more round of testing with my queued changes,
and will send them all together.

Bruce

Quoted 31 lines

Thanks

Quoted 29 lines
Quoted 16 lines
meta/classes/kernel.bbclass +5 -0
        else
                bbnote "no modules to compile"
        fi
@@ -465,6 +469,11 @@ do_shared_workdir () {
        # Copy files required for module builds
        cp System.map $kerneldir/System.map-${KERNEL_VERSION}
        [ -e Module.symvers ] && cp Module.symvers $kerneldir/
+       if [ -e ./scripts/module.lds ]; then
+               mkdir -p $kerneldir/scripts
+               cp ./scripts/module.lds $kerneldir/scripts/
+       fi
+
        cp .config $kerneldir/
        mkdir -p $kerneldir/include/config
        cp include/config/kernel.release
Quoted 7 lines

$kerneldir/include/config/kernel.release
--
2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
author
#4 lore raw
Quoted 73 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: Friday, November 13, 2020 11:50 AM
To: Li, Lili <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>; Mittal, Anuj <[email protected]>; Pan, Kris <[email protected]>
Subject: Re: [OE-core][gatesgarth][dunfell][master][PATCH] kernel.bbclass: fix module.lds missing issue since kernel v5.10

Quoted 59 lines · Lili
Quoted 58 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Bruce Ashfield
Sent: Friday, November 13, 2020 10:42 AM
To: Li, Lili <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>; Mittal, Anuj <[email protected]>; Pan, Kris <[email protected]>
Subject: Re: [OE-core][gatesgarth][dunfell][master][PATCH] kernel.bbclass: fix module.lds missing issue since kernel v5.10

Quoted 7 lines · Lili Li

With v5.10-rc1 kernel commit 596b0474d3d9 (kbuild: preprocess module linker script), external kernel module need scripts/module.lds for compiling.

Error Log:
*** No rule to make target 'scripts/module.lds', needed by ....

I have a similar change locally, but I do have a question.

Quoted 12 lines
---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
(quoted diff) +0 -0

b/meta/classes/kernel.bbclass index 9e3c34ad48..5c262f340e 100644

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 363

Quoted 6 lines
meta/classes/kernel.bbclass +3 -0
@@ -358,6 +358,10 @@ do_compile_kernelmodules() {
                # other kernel modules and will look at this
                # file to do symbol lookups
                cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
+               if [ -e ${B}/scripts/module.lds ]; then
+                       mkdir -p ${STAGING_KERNEL_BUILDDIR}/scripts
+                       cp ${B}/scripts/module.lds

${STAGING_KERNEL_BUILDDIR}/scripts/

meta/classes/kernel.bbclass do_compile_kernelmodules() { · line 364

Quoted 1 line
meta/classes/kernel.bbclass +1 -0
+               fi

You really shouldn't need this here.

The only reason we copy Module.symvers is that the kernel module build updates it.

I only have the single copy in my local change (since it is created by modules_prepare), and I'm not seeing any breakage.

Were you seeing somewhere that it was updated, or something that was breaking ?

Bruce

Quoted 8 lines
Quoted 1 line

Thanks Bruce for catching this! I add this here just in case any further changes,

we can remove it as of current process.

Quoted 1 line

Will you post your local patch or do you want me to submit v2 version?

I have a commit with a few extra details in it here, I can send it on (my) Friday, and add your Signed-off-by on it as well.

If that's ok with you ?

Sure, that's great! Thanks!

Lili

Quoted 43 lines

just wanted to run one more round of testing with my queued changes, and will
send them all together.

Bruce

Quoted 31 lines

Thanks

Quoted 29 lines
Quoted 16 lines
meta/classes/kernel.bbclass +5 -0
        else
                bbnote "no modules to compile"
        fi
@@ -465,6 +469,11 @@ do_shared_workdir () {
        # Copy files required for module builds
        cp System.map $kerneldir/System.map-${KERNEL_VERSION}
        [ -e Module.symvers ] && cp Module.symvers $kerneldir/
+       if [ -e ./scripts/module.lds ]; then
+               mkdir -p $kerneldir/scripts
+               cp ./scripts/module.lds $kerneldir/scripts/
+       fi
+
        cp .config $kerneldir/
        mkdir -p $kerneldir/include/config
        cp include/config/kernel.release
Quoted 7 lines

$kerneldir/include/config/kernel.release
--
2.17.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II