From: hongxu <hongxu.jia@eng.windriver.com>
Date: Fri, 29 Nov 2024 15:33:30 +0000 (-0800)
Subject: gcr: correct gpg2 -> gpg
X-Git-Tag: yocto-5.2~1128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff50a4aba5394dc7c19a862f2cfbcd46ff9d6079;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

gcr: correct gpg2 -> gpg

Due to commit [gnupg: upgrade 2.5.0 -> 2.5.1] applied, drop
gpg2 and use gpg to instead

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-gnome/gcr/gcr_4.3.0.bb b/meta/recipes-gnome/gcr/gcr_4.3.0.bb
index 73b36a3deac..6c620dc391d 100644
--- a/meta/recipes-gnome/gcr/gcr_4.3.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_4.3.0.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
            ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
 
-CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
+CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg'"
 
 CFLAGS += "-D_GNU_SOURCE"
 
@@ -51,7 +51,7 @@ EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross"
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
-gpg2 = '${bindir}/gpg2'
+gpg = '${bindir}/gpg'
 ssh-add = '${bindir}/ssh-add'
 ssh-agent = '${bindir}/ssh-agent'
 EOF