Commit b72cbe3d authored by Mikko Rapeli's avatar Mikko Rapeli
Browse files

Merge branch 'sbkeydir-var' into 'main' 

local.conf: Add SBSIGN_KEYS_DIR var

See merge request !216

/assign_reviewer @mikko.rapeli
parents e12eec45 e1c7e5c5

meta-trs/conf/templates/default/local.conf.sample

+9 −6
Original line number Diff line number Diff line
@@ -313,8 +313,6 @@ PACKAGECONFIG:append:pn-perf = " coresight" 


# TODO: Horrible hack bypasses bitbake SRC_URI detection. If source

# file changes, nothing will be recompiled etc.

BB_ENV_PASSTHROUGH_ADDITIONS = "UEFI_CERT_FILE"

UEFI_CERT_FILE = "${TOPDIR}/../meta-ts/meta-trustedsubstrate/uefi-certificates/uefi_certs.tgz"

BB_ENV_PASSTHROUGH_ADDITIONS = "UEFI_CAPSULE_CERT_FILE"

UEFI_CAPSULE_CERT_FILE = "${TOPDIR}/../meta-ts/meta-trustedsubstrate/uefi-certificates/capsule_certs.tgz"
@@ -344,6 +342,7 @@ MACHINE_FEATURES:append = " tpm2" 
MACHINE_FEATURES:append = " grub"

# Include TS Crypto, TS Protected Storage, TS Internal Trusted Storage and SMM-Gateway SPs into optee-os image

MACHINE_FEATURES:append = " arm-ffa ts-crypto ts-storage ts-its ts-smm-gateway"

MACHINE_FEATURES:append = " uefi-secureboot"



# We only need firmware-imx from meta-freescale

BBMASK += "meta-freescale/recipes-bsp/(?!.*firmware-imx)"
@@ -365,3 +364,7 @@ BBMASK += "meta-freescale/recipes-support/" 


# workaround for rpm needing selinux support on native

BBMASK += "meta-selinux/recipes-devtools/rpm/rpm*"



SBSIGN_KEYS_DIR = "${TOPDIR}/sbkeys"

BB_ENV_PASSTHROUGH_ADDITIONS = "SBSIGN_KEYS_DIR"