summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-10-14 16:54:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-27 07:24:24 +0000
commitdbb9af6b0b634549bf289ead86c39a4fad24d978 (patch)
treec73322a0dc028865a161f032515ceb18d213a326 /meta/lib
parentb682fca7befaeb7b08ac6104cc7041a389bd0ed0 (diff)
downloadpoky-dbb9af6b0b634549bf289ead86c39a4fad24d978.tar.gz
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 <markus.lehtonen@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.py7
1 files changed, 5 insertions, 2 deletions
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):
133 if pkgfeed_gpg_name: 133 if pkgfeed_gpg_name:
134 repomd_file = os.path.join(arch_dir, 'repodata', 'repomd.xml') 134 repomd_file = os.path.join(arch_dir, 'repodata', 'repomd.xml')
135 gpg_cmd = "%s --detach-sign --armor --batch --no-tty --yes " \ 135 gpg_cmd = "%s --detach-sign --armor --batch --no-tty --yes " \
136 "--passphrase-file '%s' -u '%s' %s" % (gpg_bin, 136 "--passphrase-file '%s' -u '%s' " % \
137 pkgfeed_gpg_pass, pkgfeed_gpg_name, repomd_file) 137 (gpg_bin, pkgfeed_gpg_pass, pkgfeed_gpg_name)
138 if self.d.getVar('GPG_PATH', True):
139 gpg_cmd += "--homedir %s " % self.d.getVar('GPG_PATH', True)
140 gpg_cmd += repomd_file
138 repo_sign_cmds.append(gpg_cmd) 141 repo_sign_cmds.append(gpg_cmd)
139 142
140 rpm_dirs_found = True 143 rpm_dirs_found = True