diff options
| author | fraser <fraser.cadger@nctechimaging.com> | 2018-06-28 15:43:31 +0100 |
|---|---|---|
| committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2018-06-29 09:21:29 +0800 |
| commit | 086aa9d299e37168ec24b9571479cdc2c32b6c2b (patch) | |
| tree | 1bda21ffa204e07dba41dd3783fb149bfe74a3c8 | |
| parent | ce1bb2fa28bd8730c70dfe4352e7070c40b28e5e (diff) | |
| download | meta-secure-core-086aa9d299e37168ec24b9571479cdc2c32b6c2b.tar.gz | |
Fix parsing bug where SYSTEM_TRUSTED and SECONDARY_TRUSTED were always parsed as true
| -rw-r--r-- | meta-signing-key/classes/user-key-store.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass index a0cecab..d300f9d 100644 --- a/meta-signing-key/classes/user-key-store.bbclass +++ b/meta-signing-key/classes/user-key-store.bbclass | |||
| @@ -11,8 +11,8 @@ UEFI_SB = '${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "1", "0", | |||
| 11 | MOK_SB = '${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "1", "0", d)}' | 11 | MOK_SB = '${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "1", "0", d)}' |
| 12 | MODSIGN = '${@bb.utils.contains("DISTRO_FEATURES", "modsign", "1", "0", d)}' | 12 | MODSIGN = '${@bb.utils.contains("DISTRO_FEATURES", "modsign", "1", "0", d)}' |
| 13 | IMA = '${@bb.utils.contains("DISTRO_FEATURES", "ima", "1", "0", d)}' | 13 | IMA = '${@bb.utils.contains("DISTRO_FEATURES", "ima", "1", "0", d)}' |
| 14 | SYSTEM_TRUSTED = '${@"1" if d.getVar("IMA", True) or d.getVar("MODSIGN", True) else "0"}' | 14 | SYSTEM_TRUSTED = '${@"1" if d.getVar("IMA", True) == "1" or d.getVar("MODSIGN", True) == "1" else "0"}' |
| 15 | SECONDARY_TRUSTED = '${@"1" if d.getVar("SYSTEM_TRUSTED", True) else "0"}' | 15 | SECONDARY_TRUSTED = '${@"1" if d.getVar("SYSTEM_TRUSTED", True) == "1" else "0"}' |
| 16 | RPM = '1' | 16 | RPM = '1' |
| 17 | 17 | ||
| 18 | def vprint(str, d): | 18 | def vprint(str, d): |