diff options
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 25c38a5642..607e7c6eaa 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -141,9 +141,12 @@ class RpmIndexer(Indexer): | |||
141 | # Sign repomd | 141 | # Sign repomd |
142 | if signer: | 142 | if signer: |
143 | for repomd in repomd_files: | 143 | for repomd in repomd_files: |
144 | feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE', True) | ||
145 | is_ascii_sig = (feed_sig_type.upper() != "BIN") | ||
144 | signer.detach_sign(repomd, | 146 | signer.detach_sign(repomd, |
145 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | 147 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), |
146 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) | 148 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), |
149 | armor=is_ascii_sig) | ||
147 | 150 | ||
148 | 151 | ||
149 | class OpkgIndexer(Indexer): | 152 | class OpkgIndexer(Indexer): |
@@ -192,10 +195,13 @@ class OpkgIndexer(Indexer): | |||
192 | bb.fatal('%s' % ('\n'.join(result))) | 195 | bb.fatal('%s' % ('\n'.join(result))) |
193 | 196 | ||
194 | if signer: | 197 | if signer: |
198 | feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE', True) | ||
199 | is_ascii_sig = (feed_sig_type.upper() != "BIN") | ||
195 | for f in index_sign_files: | 200 | for f in index_sign_files: |
196 | signer.detach_sign(f, | 201 | signer.detach_sign(f, |
197 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | 202 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), |
198 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) | 203 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), |
204 | armor=is_ascii_sig) | ||
199 | 205 | ||
200 | 206 | ||
201 | class DpkgIndexer(Indexer): | 207 | class DpkgIndexer(Indexer): |