From b41010c80c98ed5d0f987a97cb927660bc494821 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 16 Sep 2019 16:00:09 +0300 Subject: linux-yocto-integrity: fix modsign key path Use modsign key directly from uks_modsign_keys_path(d), rather than from installed package. Signed-off-by: Dmitry Eremin-Solenikov --- meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc b/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc index b950acd..829c485 100644 --- a/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc +++ b/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc @@ -17,9 +17,11 @@ SRC_URI += "\ INHIBIT_PACKAGE_STRIP = "${@'1' if d.getVar('MODSIGN_ENABLED', True) == '1' else '0'}" +inherit ${@'user-key-store' if d.getVar('MODSIGN_ENABLED', True) == '1' else ''} + do_configure_prepend() { sys_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/system_trusted_key.crt" - modsign_key="${STAGING_DIR_TARGET}${sysconfdir}/keys/modsign_key.key" + modsign_key="${@uks_modsign_keys_dir(d)}/modsign_key.key" modsign_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/modsign_key.crt" if [ -f "$sys_cert" ]; then -- cgit v1.2.3-54-g00ecf