From dbb9af6b0b634549bf289ead86c39a4fad24d978 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 14 Oct 2015 16:54:42 +0300 Subject: package_manager: support GPG_PATH variable If defined, use GPG_PATH as the gpg home directory when signing package feeds. This setting is only used by package_manager if package feed singning has been enabled, i.e. PACKAGE_FEED_SIGN="1". (From OE-Core rev: 2c94853e4c8e92ac5fe4af7b25e2ce8853a4025b) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index c34e4366bf..5c2130b4db 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -133,8 +133,11 @@ class RpmIndexer(Indexer): if pkgfeed_gpg_name: repomd_file = os.path.join(arch_dir, 'repodata', 'repomd.xml') gpg_cmd = "%s --detach-sign --armor --batch --no-tty --yes " \ - "--passphrase-file '%s' -u '%s' %s" % (gpg_bin, - pkgfeed_gpg_pass, pkgfeed_gpg_name, repomd_file) + "--passphrase-file '%s' -u '%s' " % \ + (gpg_bin, pkgfeed_gpg_pass, pkgfeed_gpg_name) + if self.d.getVar('GPG_PATH', True): + gpg_cmd += "--homedir %s " % self.d.getVar('GPG_PATH', True) + gpg_cmd += repomd_file repo_sign_cmds.append(gpg_cmd) rpm_dirs_found = True -- cgit v1.2.3-54-g00ecf