summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-02-10 16:15:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 22:55:11 +0000
commitce653694a87fd77d79ec3d28ed3365a2c8e57ad6 (patch)
treed342c16ce82ae30a08b28991439940bb5310c9d5 /meta/lib/oe
parent4445c645c71151bd56ff7e133343a6f1e30cc3b3 (diff)
downloadopenembedded-core-ce653694a87fd77d79ec3d28ed3365a2c8e57ad6.tar.gz
openembedded-core-ce653694a87fd77d79ec3d28ed3365a2c8e57ad6.tar.bz2
openembedded-core-ce653694a87fd77d79ec3d28ed3365a2c8e57ad6.zip
oe/gpg_sign: add 'armor' argument to detach_sign()
[YOCTO #9006] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/gpg_sign.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index a4f310e536..16a23645b6 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -52,13 +52,15 @@ class LocalSigner(object):
bb.error('rpmsign failed: %s' % proc.before.strip())
raise bb.build.FuncFailed("Failed to sign RPM packages")
- def detach_sign(self, input_file):
+ def detach_sign(self, input_file, armor=True):
"""Create a detached signature of a file"""
- cmd = "%s --detach-sign --armor --batch --no-tty --yes " \
+ cmd = "%s --detach-sign --batch --no-tty --yes " \
"--passphrase-file '%s' -u '%s' " % \
(self.gpg_bin, self.passphrase_file, self.keyid)
if self.gpg_path:
cmd += "--homedir %s " % self.gpg_path
+ if armor:
+ cmd += "--armor "
cmd += input_file
status, output = oe.utils.getstatusoutput(cmd)
if status: