summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-02-19 08:45:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-26 17:16:25 +0000
commit7bb9e8ddbfabfbaebe1b3cb635b6d9979854cc47 (patch)
tree2255b9e26f87d9aab9c92fe9f76d44f2ef421e8f /meta/lib
parent64ab17b707dc431aaed880d6d8615971243f46f8 (diff)
downloadpoky-7bb9e8ddbfabfbaebe1b3cb635b6d9979854cc47.tar.gz
signing-keys: Make signing keys the only publisher of keys
Previously the keys were put into the os-release package. The package indexing code was also deploying the keys rather than only using the keys. This change makes signing-keys.bb the only publisher of the keys and also uses standard tasks that already have sstate. (From OE-Core rev: 1e38068ac38dfd067655dfd41464e28439179306) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index b30a4da057..5cd43e9b1d 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -144,16 +144,6 @@ class RpmIndexer(Indexer):
144 signer.detach_sign(repomd, 144 signer.detach_sign(repomd,
145 self.d.getVar('PACKAGE_FEED_GPG_NAME', True), 145 self.d.getVar('PACKAGE_FEED_GPG_NAME', True),
146 self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) 146 self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True))
147 # Copy pubkey(s) to repo
148 distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0"
149 if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1':
150 shutil.copy2(self.d.getVar('RPM_GPG_PUBKEY', True),
151 os.path.join(self.deploy_dir,
152 'RPM-GPG-KEY-%s' % distro_version))
153 if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1':
154 shutil.copy2(self.d.getVar('PACKAGE_FEED_GPG_PUBKEY', True),
155 os.path.join(self.deploy_dir,
156 'REPODATA-GPG-KEY-%s' % distro_version))
157 147
158 148
159class OpkgIndexer(Indexer): 149class OpkgIndexer(Indexer):