diff options
| author | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-20 15:03:18 +0800 |
|---|---|---|
| committer | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-20 15:03:18 +0800 |
| commit | 038aa54bc28fa4c4c19a711596260eb8bb8576be (patch) | |
| tree | b60144d4846a89ca701f554fb99ee4b51f462c98 | |
| parent | 373d7276bc1c1b3c7a580001969fdcf7b60a0a98 (diff) | |
| download | meta-secure-core-038aa54bc28fa4c4c19a711596260eb8bb8576be.tar.gz | |
signing-keys: fix gpg key import failure due to wrong option position
Signed-off-by: Jia Zhang <lans.zhang2008@gmail.com>
| -rw-r--r-- | meta-integrity/recipes-core/meta/signing-keys.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-integrity/recipes-core/meta/signing-keys.bbappend b/meta-integrity/recipes-core/meta/signing-keys.bbappend index 4f64efa..607438a 100644 --- a/meta-integrity/recipes-core/meta/signing-keys.bbappend +++ b/meta-integrity/recipes-core/meta/signing-keys.bbappend | |||
| @@ -13,8 +13,8 @@ python check_public_keys () { | |||
| 13 | 13 | ||
| 14 | # Import RPM_GPG_NAME if not found | 14 | # Import RPM_GPG_NAME if not found |
| 15 | gpg_key = uks_rpm_keys_dir(d) + 'RPM-GPG-PRIVKEY-' + gpg_keyid | 15 | gpg_key = uks_rpm_keys_dir(d) + 'RPM-GPG-PRIVKEY-' + gpg_keyid |
| 16 | cmd = '%s --batch --homedir %s --import %s --passphrase %s' % \ | 16 | cmd = '%s --batch --homedir %s --passphrase %s --import %s' % \ |
| 17 | (gpg_bin, gpg_path, gpg_key, d.getVar('RPM_GPG_PASSPHRASE', True)) | 17 | (gpg_bin, gpg_path, d.getVar('RPM_GPG_PASSPHRASE', True), gpg_key) |
| 18 | status, output = oe.utils.getstatusoutput(cmd) | 18 | status, output = oe.utils.getstatusoutput(cmd) |
| 19 | if status: | 19 | if status: |
| 20 | raise bb.build.FuncFailed('Failed to import gpg key (%s): %s' % | 20 | raise bb.build.FuncFailed('Failed to import gpg key (%s): %s' % |