From: Lans Zhang Date: Tue, 11 Jul 2017 04:43:02 +0000 (+0800) Subject: gpg_sign.py: fix overwriting the RPM macro __gpg in a wrong way X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20756 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fda41cef26b600d599dfb7f2e61c5829e2b309c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 %%. Signed-off-by: Lans Zhang Signed-off-by: Ross Burton --- diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py index 7ce767ee0a0..c53df54a5b7 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py @@ -36,7 +36,7 @@ class LocalSigner(object): gpg_args += ' --pinentry-mode=loopback' cmd += "--define '_gpg_sign_cmd_extra_args %s' " % gpg_args if self.gpg_bin: - cmd += "--define '%%__gpg %s' " % self.gpg_bin + cmd += "--define '__gpg %s' " % self.gpg_bin if self.gpg_path: cmd += "--define '_gpg_path %s' " % self.gpg_path