mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 12:47:00 +00:00
Code Issues Projects Releases Wiki Activity

linux-yocto-integrity.inc: fix 'uks_modsign_keys_dir' is not defined (#119)

Browse Source 
Since commit [b41010c linux-yocto-integrity: fix modsign key path] applied,
if MODSIGN_ENABLED is "0", bbclass user-key-store will not be inherited
which causing 'uks_modsign_keys_dir' is not defined

Unconditionally inherit user-key-store, but conditionally invoke
uks_modsign_keys_dir

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
This commit is contained in:
Hongxu Jia
2019-10-07 11:51:32 +08:00
committed by Jia Zhang
parent 2d8b45a3d8
commit 69117bef3a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc
+6 -2
View File
@@ -17,11 +17,15 @@ SRC_URI += "\
INHIBIT_PACKAGE_STRIP = "${@'1' if d.getVar('MODSIGN_ENABLED', True) == '1' else '0'}" 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 ''} inherit user-key-store
do_configure_prepend() { do_configure_prepend() {
sys_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/system_trusted_key.crt" sys_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/system_trusted_key.crt"
modsign_key="${@uks_modsign_keys_dir(d)}/modsign_key.key" if [ ${MODSIGN_ENABLED} = "1" ]; then
modsign_key="${@uks_modsign_keys_dir(d)}/modsign_key.key"
else
modsign_key="${STAGING_DIR_TARGET}${sysconfdir}/keys/modsign_key.key"
fi
modsign_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/modsign_key.crt" modsign_cert="${STAGING_DIR_TARGET}${sysconfdir}/keys/modsign_key.crt"
if [ -f "$sys_cert" ]; then if [ -f "$sys_cert" ]; then