summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-10-29 10:47:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-30 13:47:54 +0000
commit5f67715b7a733d8c1fcdd1cb5da0965b4cd4fee2 (patch)
tree5b68a0e505e5da4013ede5aa11f0e36a2d3dd11c
parent4ada58f74c9bb5ab2fd4ef7a0c6ee4219b579d4b (diff)
downloadpoky-5f67715b7a733d8c1fcdd1cb5da0965b4cd4fee2.tar.gz
kernel.bbclass: fix installation of modules signing certificates
If one has provided external key/certificate for modules signing, Kbuild will skip creating signing_key.pem and will write only signing_key.x509 certificate. Thus we have to check for .x509 file existence rather than .pem one. (From OE-Core rev: 6ab0206b8252755367f2357f49007dd78336fec0) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2527e731eba43bd36d0ea268aca6b03155376134) Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 111a0b2eeb..fb1f49327c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -453,7 +453,7 @@ do_shared_workdir () {
453 cp .config $kerneldir/ 453 cp .config $kerneldir/
454 mkdir -p $kerneldir/include/config 454 mkdir -p $kerneldir/include/config
455 cp include/config/kernel.release $kerneldir/include/config/kernel.release 455 cp include/config/kernel.release $kerneldir/include/config/kernel.release
456 if [ -e certs/signing_key.pem ]; then 456 if [ -e certs/signing_key.x509 ]; then
457 # The signing_key.* files are stored in the certs/ dir in 457 # The signing_key.* files are stored in the certs/ dir in
458 # newer Linux kernels 458 # newer Linux kernels
459 mkdir -p $kerneldir/certs 459 mkdir -p $kerneldir/certs