diff options
| author | Lans Zhang <jia.zhang@windriver.com> | 2017-07-11 12:43:02 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:37 +0100 |
| commit | 946a3dae158ed4709915645ba06dc9bab159be34 (patch) | |
| tree | 1f78c488002f17661e05ab85a3300ccb434642e8 | |
| parent | b15df41d7d6074e76fea8d1c4f1d12273b46f1a3 (diff) | |
| download | poky-946a3dae158ed4709915645ba06dc9bab159be34.tar.gz | |
gpg_sign.py: fix overwriting the RPM macro __gpg in a wrong way
The RPM macro used in --define option should not be prefixed by %%.
(From OE-Core rev: 2fda41cef26b600d599dfb7f2e61c5829e2b309c)
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/gpg_sign.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py index 7ce767ee0a..c53df54a5b 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py | |||
| @@ -36,7 +36,7 @@ class LocalSigner(object): | |||
| 36 | gpg_args += ' --pinentry-mode=loopback' | 36 | gpg_args += ' --pinentry-mode=loopback' |
| 37 | cmd += "--define '_gpg_sign_cmd_extra_args %s' " % gpg_args | 37 | cmd += "--define '_gpg_sign_cmd_extra_args %s' " % gpg_args |
| 38 | if self.gpg_bin: | 38 | if self.gpg_bin: |
| 39 | cmd += "--define '%%__gpg %s' " % self.gpg_bin | 39 | cmd += "--define '__gpg %s' " % self.gpg_bin |
| 40 | if self.gpg_path: | 40 | if self.gpg_path: |
| 41 | cmd += "--define '_gpg_path %s' " % self.gpg_path | 41 | cmd += "--define '_gpg_path %s' " % self.gpg_path |
| 42 | 42 | ||