summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-10-11 10:16:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 15:54:00 +0100
commit9257748714134900690b4eb923a3d59cde41fcc0 (patch)
treed9cca945dd422a6b8382eaaa9422f573b83f0846
parentc272ecd65b3c2be9a411a79576d934378025c7bb (diff)
downloadpoky-9257748714134900690b4eb923a3d59cde41fcc0.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: 4972582767a3325d22a16db9a5479c2d0001964b) 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 bd185e258e..c72d1fe78a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -451,7 +451,7 @@ do_shared_workdir () {
451 cp .config $kerneldir/ 451 cp .config $kerneldir/
452 mkdir -p $kerneldir/include/config 452 mkdir -p $kerneldir/include/config
453 cp include/config/kernel.release $kerneldir/include/config/kernel.release 453 cp include/config/kernel.release $kerneldir/include/config/kernel.release
454 if [ -e certs/signing_key.pem ]; then 454 if [ -e certs/signing_key.x509 ]; then
455 # The signing_key.* files are stored in the certs/ dir in 455 # The signing_key.* files are stored in the certs/ dir in
456 # newer Linux kernels 456 # newer Linux kernels
457 mkdir -p $kerneldir/certs 457 mkdir -p $kerneldir/certs