From 1e38068ac38dfd067655dfd41464e28439179306 Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Fri, 19 Feb 2016 08:45:25 -0800 Subject: 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. Signed-off-by: Randy Witt Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'meta/lib/oe') 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): signer.detach_sign(repomd, self.d.getVar('PACKAGE_FEED_GPG_NAME', True), self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True)) - # Copy pubkey(s) to repo - distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" - if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': - shutil.copy2(self.d.getVar('RPM_GPG_PUBKEY', True), - os.path.join(self.deploy_dir, - 'RPM-GPG-KEY-%s' % distro_version)) - if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': - shutil.copy2(self.d.getVar('PACKAGE_FEED_GPG_PUBKEY', True), - os.path.join(self.deploy_dir, - 'REPODATA-GPG-KEY-%s' % distro_version)) class OpkgIndexer(Indexer): -- cgit 1.2.3-korg