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

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

[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.

Signed-off-by: Mattias Waldo <mattias.waldo@saabgroup.com>
---
 meta/classes/kernel.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6e3e81e..2bfd65c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -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
-- 
2.9.3

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On 25 August 2016 at 10:20, Waldo Mattias <Mattias.Waldo@saabgroup.com>
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

[-- Attachment #2: Type: text/html, Size: 1600 bytes --]

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Waldo Mattias]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

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

Regards,

Mattias

From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: den 25 augusti 2016 15:51
To: Waldo Mattias <Mattias.Waldo@saabgroup.com>
Cc: openembedded-core@lists.openembedded.org
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 <Mattias.Waldo@saabgroup.com<mailto:Mattias.Waldo@saabgroup.com>> 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

[-- Attachment #2: Type: text/html, Size: 5218 bytes --]

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Waldo Mattias]

[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]

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

Regards,

Mattias

From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: den 25 augusti 2016 15:51
To: Waldo Mattias <Mattias.Waldo@saabgroup.com>
Cc: openembedded-core@lists.openembedded.org
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 <Mattias.Waldo@saabgroup.com<mailto:Mattias.Waldo@saabgroup.com>> 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

[-- Attachment #2: Type: text/html, Size: 5234 bytes --]

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

On 25 August 2016 at 16:16, Waldo Mattias <Mattias.Waldo@saabgroup.com>
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

[-- Attachment #2: Type: text/html, Size: 1220 bytes --]

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Waldo Mattias]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

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:ross.burton@intel.com]
Sent: den 25 augusti 2016 18:48
To: Waldo Mattias <Mattias.Waldo@saabgroup.com>
Cc: openembedded-core@lists.openembedded.org
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 <Mattias.Waldo@saabgroup.com<mailto:Mattias.Waldo@saabgroup.com>> 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

[-- Attachment #2: Type: text/html, Size: 4630 bytes --]

Re: [PATCH v2] kernel.bbclass: include signing keys when copying files required for module builds

[Waldo Mattias]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

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:ross.burton@intel.com]
Sent: den 25 augusti 2016 18:48
To: Waldo Mattias <Mattias.Waldo@saabgroup.com>
Cc: openembedded-core@lists.openembedded.org
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 <Mattias.Waldo@saabgroup.com<mailto:Mattias.Waldo@saabgroup.com>> 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

[-- Attachment #2: Type: text/html, Size: 4734 bytes --]