Skip to contentSkip to conversation

kernel.bbclass: include signing keys when copying files required for module builds

PATCH Superseded Waldo Mattias 2 participants 7 messages Aug 25, 2016 – Aug 27, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 kernel.bbclass: include signing keys when copying files required for module builds

The absence of certs/signing_key.* in $kerneldir made signing of out-of-tree kernel modules fail (silently). Add copying of these files during the shared_workdir task.

---
 meta/classes/kernel.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/kernel.bbclass +2 -0
index 6e3e81e..2bfd65c 100644
@@ -295,6 +295,8 @@ do_shared_workdir () {
        cp .config $kerneldir/
        mkdir -p $kerneldir/include/config
        cp include/config/kernel.release $kerneldir/include/config/kernel.release
+       mkdir -p $kerneldir/certs
+       cp certs/signing_key.* $kerneldir/certs
 
        # We can also copy over all the generated files and avoid special cases
        # like version.h, but we've opted to keep this small until file creep starts
Signature · 1 line
2.9.3
#1 lore raw
Quoted 4 lines · Waldo Mattias

The absence of certs/signing_key.* in $kerneldir made signing of out-of-tree kernel modules fail (silently). Add copying of these files during the shared_workdir task.

Are you sure that you based this on current master?

Applying: kernel.bbclass: include signing keys when copying files required for module builds
Using index info to reconstruct a base tree...
M meta/classes/kernel.bbclass
error: patch failed: meta/classes/kernel.bbclass:295
error: meta/classes/kernel.bbclass: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 kernel.bbclass: include signing keys when copying files required for module builds

Ross

#2 lore raw

No, I based it on krogoth…sorry. I’ll get back to you with an update. Thanks!

Regards,

Mattias

From: Burton, Ross [mailto:[email protected]]
Sent: den 25 augusti 2016 15:51
To: Waldo Mattias <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

On 25 August 2016 at 10:20, Waldo Mattias <[email protected]<mailto:[email protected]>> wrote:
The absence of certs/signing_key.* in $kerneldir made signing of
out-of-tree kernel modules fail (silently). Add copying of these files
during the shared_workdir task.

Are you sure that you based this on current master?

Applying: kernel.bbclass: include signing keys when copying files required for module builds Using index info to reconstruct a base tree...
M meta/classes/kernel.bbclass
error: patch failed: meta/classes/kernel.bbclass:295
error: meta/classes/kernel.bbclass: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 kernel.bbclass: include signing keys when copying files required for module builds

Ross

#3 lore raw
In reply to Burton, Ross

Version 3 of the patch submitted, this time based on current master – thanks for your patience!

Regards,

Mattias

From: Burton, Ross [mailto:[email protected]]
Sent: den 25 augusti 2016 15:51
To: Waldo Mattias <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

On 25 August 2016 at 10:20, Waldo Mattias <[email protected]<mailto:[email protected]>> wrote:
The absence of certs/signing_key.* in $kerneldir made signing of
out-of-tree kernel modules fail (silently). Add copying of these files
during the shared_workdir task.

Are you sure that you based this on current master?

Applying: kernel.bbclass: include signing keys when copying files required for module builds Using index info to reconstruct a base tree...
M meta/classes/kernel.bbclass
error: patch failed: meta/classes/kernel.bbclass:295
error: meta/classes/kernel.bbclass: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 kernel.bbclass: include signing keys when copying files required for module builds

Ross

#4 lore raw
Quoted 4 lines · Waldo Mattias

Version 3 of the patch submitted, this time based on current master – thanks for your patience!

Something really odd is going on here... the references blobs in the patch don't exist according to my git, and it looks like the whitespace is being mangled. Can you verify that you're basing this patch from origin/master or poky or oe-core, and use git-send-email to ensure that the whitespace doesn't get trashed?

I'd normally just manually apply but something odd is happening and I'd like to figure out what it is!

Ross

#5 lore raw

I’m behind a corporate firewall, so git-send-email doesn’t work. I’ll see what I can do…

/Mattias

From: Burton, Ross [mailto:[email protected]]
Sent: den 25 augusti 2016 18:48
To: Waldo Mattias <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

On 25 August 2016 at 16:16, Waldo Mattias <[email protected]<mailto:[email protected]>> wrote:
Version 3 of the patch submitted, this time based on current master – thanks for your patience!

Something really odd is going on here... the references blobs in the patch don't exist according to my git, and it looks like the whitespace is being mangled. Can you verify that you're basing this patch from origin/master or poky or oe-core, and use git-send-email to ensure that the whitespace doesn't get trashed?

I'd normally just manually apply but something odd is happening and I'd like to figure out what it is!

Ross

#6 lore raw
In reply to Burton, Ross

Version 4 of the patch seems to apply cleanly, at least to my local oe-core and poky repos. I guess my attempt to outsmart the company firewall got tabs and spaces mixed up – in the end, I had to re-send the patch from my own Linux machine. Thanks again for your patience.

/Mattias

From: Burton, Ross [mailto:[email protected]]
Sent: den 25 augusti 2016 18:48
To: Waldo Mattias <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

On 25 August 2016 at 16:16, Waldo Mattias <[email protected]<mailto:[email protected]>> wrote:
Version 3 of the patch submitted, this time based on current master – thanks for your patience!

Something really odd is going on here... the references blobs in the patch don't exist according to my git, and it looks like the whitespace is being mangled. Can you verify that you're basing this patch from origin/master or poky or oe-core, and use git-send-email to ensure that the whitespace doesn't get trashed?

I'd normally just manually apply but something odd is happening and I'd like to figure out what it is!

Ross