summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiwei Song <liwei.song@windriver.com>2020-05-26 04:38:38 +0000
committerJia Zhang <zhang.jia@linux.alibaba.com>2021-04-21 12:57:22 +0800
commit9880c3ab33ca96daad6c9c63389ccbcfea63973b (patch)
treeeb2b12a92aa2cd51110da8e1550c906a8fbbb5d7
parentf6963bf84b514d004ecfc738d57409f2fd92ecf2 (diff)
downloadmeta-secure-core-9880c3ab33ca96daad6c9c63389ccbcfea63973b.tar.gz
Revert "user-key-store.bbclass: Kill gpg agent daemon after gpg sign"
This reverts commit fc8969af8a34ff93ede7d44a492750446154d950. In parallel build this will led sign error because the gpg-agent in using maybe killed in another task. Signed-off-by: Liwei Song <liwei.song@windriver.com>
-rw-r--r--meta-signing-key/classes/user-key-store.bbclass4
1 files changed, 0 insertions, 4 deletions
diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass
index e41cdf3..f89a810 100644
--- a/meta-signing-key/classes/user-key-store.bbclass
+++ b/meta-signing-key/classes/user-key-store.bbclass
@@ -540,10 +540,6 @@ def boot_sign(input, d):
540 status, output = oe.utils.getstatusoutput(cmd) 540 status, output = oe.utils.getstatusoutput(cmd)
541 if status: 541 if status:
542 bb.fatal('Failed to sign: %s' % (input)) 542 bb.fatal('Failed to sign: %s' % (input))
543 gpg_conf = bb.utils.which(os.getenv('PATH'), 'gpgconf')
544 cmd = 'GNUPGHOME=%s %s --kill gpg-agent' % \
545 (gpg_path, gpg_conf)
546 status, output = oe.utils.getstatusoutput(cmd)
547 543
548def uks_boot_sign(input, d): 544def uks_boot_sign(input, d):
549 boot_sign(input, d) 545 boot_sign(input, d)