summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-05-23 09:05:17 +0000
committerJia Zhang <zhang.jia@linux.alibaba.com>2018-05-23 19:32:55 +0800
commit7824fbdea866f17bcbf631a028828d93d5d9892c (patch)
tree6a999aa86c116882c1afaf17b107f14753ad1871
parentb23950cf556b0ac847993bebe6483357539b65d2 (diff)
downloadmeta-secure-core-7824fbdea866f17bcbf631a028828d93d5d9892c.tar.gz
sign_rpm_ext.bbclass: check rpm public key at image recipe parsing time
While multiple builds share a common sstate, the latter build failed to build image which the public key not found. ... |ERROR: initramfs-ostree-image-1.0-r0 do_rootfs: Importing GPG key failed. Command 'rpmkeys --root=<path>/rootfs --import <path>/rpm-key' returned 1: ... The latter build will not regenerate rpm packages and check_rpm_public_key will not be invoked. Explicitly invoke check_rpm_public_key at image recipe parsing time, which make sure gpg public key be imported. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--meta-integrity/classes/sign_rpm_ext.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-integrity/classes/sign_rpm_ext.bbclass b/meta-integrity/classes/sign_rpm_ext.bbclass
index 2a8dedc..4a25691 100644
--- a/meta-integrity/classes/sign_rpm_ext.bbclass
+++ b/meta-integrity/classes/sign_rpm_ext.bbclass
@@ -47,4 +47,8 @@ python () {
47 if status: 47 if status:
48 raise bb.build.FuncFailed('Failed to create gpg keying %s: %s' % 48 raise bb.build.FuncFailed('Failed to create gpg keying %s: %s' %
49 (gpg_path, output)) 49 (gpg_path, output))
50
51 is_image = bb.data.inherits_class('image', d)
52 if is_image:
53 bb.build.exec_func("check_rpm_public_key", d)
50} 54}