diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-02-10 16:15:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-19 01:01:25 +0000 |
commit | e845b75f8fc718765158a858cfe904c575315f45 (patch) | |
tree | a456ad2949d45e46a9f886717eb02c3c822aa90c /meta/lib/oe/package_manager.py | |
parent | d5be8666a1f429283e8200ef67f1fc3afa587c4f (diff) | |
download | poky-e845b75f8fc718765158a858cfe904c575315f45.tar.gz |
sign_rpm.bbclass: do not store key details in signer instance
Refactor the LocalSigner class. Do not store keyid or passphrase file in
the signer object as they are only needed for some of the methods. For
example, the newly added verify() method does not need any key
parameters and export_pubkey only uses keyid.
(From OE-Core rev: e2412294b6b1d3a80ee97a0706613349edc51d33)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 26f6466ed1..b30a4da057 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -110,10 +110,7 @@ class RpmIndexer(Indexer): | |||
110 | 110 | ||
111 | rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo") | 111 | rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo") |
112 | if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': | 112 | if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': |
113 | signer = get_signer(self.d, | 113 | signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) |
114 | self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True), | ||
115 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | ||
116 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) | ||
117 | else: | 114 | else: |
118 | signer = None | 115 | signer = None |
119 | index_cmds = [] | 116 | index_cmds = [] |
@@ -144,7 +141,9 @@ class RpmIndexer(Indexer): | |||
144 | # Sign repomd | 141 | # Sign repomd |
145 | if signer: | 142 | if signer: |
146 | for repomd in repomd_files: | 143 | for repomd in repomd_files: |
147 | signer.detach_sign(repomd) | 144 | signer.detach_sign(repomd, |
145 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | ||
146 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) | ||
148 | # Copy pubkey(s) to repo | 147 | # Copy pubkey(s) to repo |
149 | distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" | 148 | distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" |
150 | if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': | 149 | if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': |