diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2019-12-12 11:33:46 -0800 |
---|---|---|
committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2019-12-13 09:02:14 +0800 |
commit | f59b77b257b12a290e93a185d6499cdabc80a66c (patch) | |
tree | c104ca2aba92ccc78811172ec83d947baab3f90c | |
parent | e4e766aa4029d2e56ce6ba8d0b18d94a7ffaa99d (diff) | |
download | meta-secure-core-f59b77b257b12a290e93a185d6499cdabc80a66c.tar.gz |
user-key-store.bbclass: Depend on gnupg-native to always use provided gpg
On some host configuration such as ubuntu 16.04 the gnupg in /usr/bin
is the 1.x version. This can cause problems between the import and
signing process if the gpg version is different. The commands in the
user-key-store class assume gnupg is at least version 2.2 or newer.
To avoid the signing phase failing for the efitools and the kernel,
the user-key-store class should depend on the gnupg-native binaries.
It avoids this specific error:
ERROR: efitools-1.9.2+gitAUTOINC+392836a46c-r0 do_sign: Failed to sign: /opt/tmp-glibc/work/corei7-64-wrs-linux/efitools/1.9.2+gitAUTOINC+392836a46c-r0/image/boot/efi/EFI/BOOT/LockDown.efi
ERROR: Logfile of failure stored in: /opt/tmp-glibc/work/corei7-64-wrs-linux/efitools/1.9.2+gitAUTOINC+392836a46c-r0/temp/log.do_sign.22969
NOTE: recipe efitools-1.9.2+gitAUTOINC+392836a46c-r0: task do_sign: Failed
[ Issue: LIN1019-3757 ]
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-rw-r--r-- | meta-signing-key/classes/user-key-store.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass index f9ca09a..b5dd9a8 100644 --- a/meta-signing-key/classes/user-key-store.bbclass +++ b/meta-signing-key/classes/user-key-store.bbclass | |||
@@ -2,7 +2,7 @@ DEPENDS_append_class-target += "\ | |||
2 | sbsigntool-native \ | 2 | sbsigntool-native \ |
3 | libsign-native \ | 3 | libsign-native \ |
4 | openssl-native \ | 4 | openssl-native \ |
5 | ${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "efitools-native", "", d)} \ | 5 | ${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "efitools-native gnupg-native", "", d)} \ |
6 | " | 6 | " |
7 | 7 | ||
8 | USER_KEY_SHOW_VERBOSE = "1" | 8 | USER_KEY_SHOW_VERBOSE = "1" |