summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuojian <guojian.zhou@windriver.com>2017-08-22 15:14:21 +0800
committerLans Zhang <lans.zhang2008@gmail.com>2017-08-22 15:14:21 +0800
commit6ad9a338e616ff3eed629b7917946f56af903da6 (patch)
tree313443d4caebc7cc76b87fca1ff9fd0cab5c6057
parentab05be3c9ccb0252051abbcde64d5445374848b6 (diff)
downloadmeta-secure-core-6ad9a338e616ff3eed629b7917946f56af903da6.tar.gz
Fix the user rpm sign key can not be found issue (#5)
When the SIGNING_MODEL is set to "user", the signing-keys recipes will run failed on the get_public_keys task. uks_rpm_keys_dir() function could not return the right rpm_keys directory when the SIGNING_MODEL is set to "user". Signed-off-by: Guojian Zhou <guojian.zhou@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 c3ed1cf..6d749c0 100644
--- a/meta-signing-key/classes/user-key-store.bbclass
+++ b/meta-signing-key/classes/user-key-store.bbclass
@@ -29,10 +29,6 @@ def uks_ima_keys_dir(d):
29 return d.getVar('IMA_KEYS_DIR', True) + '/' 29 return d.getVar('IMA_KEYS_DIR', True) + '/'
30 30
31def uks_rpm_keys_dir(d): 31def uks_rpm_keys_dir(d):
32 # XXX: currently the user rpm pubkey is not supported.
33 if uks_signing_model(d) != 'sample':
34 return ''
35
36 set_keys_dir('RPM', d) 32 set_keys_dir('RPM', d)
37 return d.getVar('RPM_KEYS_DIR', True) + '/' 33 return d.getVar('RPM_KEYS_DIR', True) + '/'
38 34